Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Installer support for experimental MySQL 4.1/5.0 binary-safe schema

Browse source
This commit is contained in:
Brion Vibber 2006-11-24 22:10:11 +00:00
parent aff341725b
commit ee7447d3ad
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -214,6 +214,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
in the autoblock_whitelist system message.
* Added placeholders for text injection by hooks to EditPage.php
* (bug 8009) Automatic edit summary for redirects is not filled for edits in existing pages
* Installer support for experimental MySQL 4.1/5.0 binary-safe schema
== Languages updated ==

29
config/index.php
View file

@ -532,9 +532,10 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
$conf->RootPW = importPost( "RootPW", "-" );
## MySQL specific:
$conf->DBprefix = importPost( "DBprefix" );
$conf->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false";
$conf->LanguageCode = importPost( "LanguageCode", "en" );
$conf->DBprefix = importPost( "DBprefix" );
$conf->DBschema = importPost( "DBschema", "mysql4" );
$conf->DBmysql5 = ($conf->DBschema == "mysql5" || $conf->DBschema == "mysql5-binary");
$conf->LanguageCode = importPost( "LanguageCode", "en" );
## Postgres specific:
$conf->DBport = importPost( "DBport", "5432" );
@ -836,12 +837,21 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
# FIXME: Check for errors
print "<li>Creating tables...";
if ($conf->DBtype == 'mysql') {
if( $wgDBmysql5 ) {
print " using MySQL 5 table defs...";
dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase );
} else {
switch( $conf->DBschema ) {
case "mysql4":
print " using MySQL 4 table defs...";
dbsource( "../maintenance/tables.sql", $wgDatabase );
break;
case "mysql5":
print " using MySQL 5 UTF-8 table defs...";
dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase );
break;
case "mysql5-binary":
print " using MySQL 5 binary table defs...";
dbsource( "../maintenance/mysql5/tables-binary.sql", $wgDatabase );
break;
default:
dieout( " <b>invalid schema selection!</b></li>" );
}
dbsource( "../maintenance/interwiki.sql", $wgDatabase );
} else if ($conf->DBtype == 'postgres') {
@ -1198,8 +1208,9 @@ if( count( $errs ) ) {
<div class="config-input"><label class="column">Database charset</label>
<div>Select one:</div>
<ul class="plain">
<li><?php aField( $conf, "DBmysql5", "Backwards-compatible UTF-8", "radio", "false" ); ?></li>
<li><?php aField( $conf, "DBmysql5", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "true" ); ?></li>
<li><?php aField( $conf, "DBschema", "Backwards-compatible UTF-8", "radio", "mysql4" ); ?></li>
<li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "mysql5" ); ?></li>
<li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 binary", "radio", "mysql5-binary" ); ?></li>
</ul>
</div>
<p class="config-desc">