| Index: trunk/phase3/config/index.php |
| — | — | @@ -532,9 +532,10 @@ |
| 533 | 533 | $conf->RootPW = importPost( "RootPW", "-" ); |
| 534 | 534 | |
| 535 | 535 | ## MySQL specific: |
| 536 | | - $conf->DBprefix = importPost( "DBprefix" ); |
| 537 | | - $conf->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false"; |
| 538 | | - $conf->LanguageCode = importPost( "LanguageCode", "en" ); |
| | 536 | + $conf->DBprefix = importPost( "DBprefix" ); |
| | 537 | + $conf->DBschema = importPost( "DBschema", "mysql4" ); |
| | 538 | + $conf->DBmysql5 = ($conf->DBschema == "mysql5" || $conf->DBschema == "mysql5-binary"); |
| | 539 | + $conf->LanguageCode = importPost( "LanguageCode", "en" ); |
| 539 | 540 | |
| 540 | 541 | ## Postgres specific: |
| 541 | 542 | $conf->DBport = importPost( "DBport", "5432" ); |
| — | — | @@ -836,12 +837,21 @@ |
| 837 | 838 | # FIXME: Check for errors |
| 838 | 839 | print "<li>Creating tables..."; |
| 839 | 840 | if ($conf->DBtype == 'mysql') { |
| 840 | | - if( $wgDBmysql5 ) { |
| 841 | | - print " using MySQL 5 table defs..."; |
| 842 | | - dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase ); |
| 843 | | - } else { |
| | 841 | + switch( $conf->DBschema ) { |
| | 842 | + case "mysql4": |
| 844 | 843 | print " using MySQL 4 table defs..."; |
| 845 | 844 | dbsource( "../maintenance/tables.sql", $wgDatabase ); |
| | 845 | + break; |
| | 846 | + case "mysql5": |
| | 847 | + print " using MySQL 5 UTF-8 table defs..."; |
| | 848 | + dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase ); |
| | 849 | + break; |
| | 850 | + case "mysql5-binary": |
| | 851 | + print " using MySQL 5 binary table defs..."; |
| | 852 | + dbsource( "../maintenance/mysql5/tables-binary.sql", $wgDatabase ); |
| | 853 | + break; |
| | 854 | + default: |
| | 855 | + dieout( " <b>invalid schema selection!</b></li>" ); |
| 846 | 856 | } |
| 847 | 857 | dbsource( "../maintenance/interwiki.sql", $wgDatabase ); |
| 848 | 858 | } else if ($conf->DBtype == 'postgres') { |
| — | — | @@ -1198,8 +1208,9 @@ |
| 1199 | 1209 | <div class="config-input"><label class="column">Database charset</label> |
| 1200 | 1210 | <div>Select one:</div> |
| 1201 | 1211 | <ul class="plain"> |
| 1202 | | - <li><?php aField( $conf, "DBmysql5", "Backwards-compatible UTF-8", "radio", "false" ); ?></li> |
| 1203 | | - <li><?php aField( $conf, "DBmysql5", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "true" ); ?></li> |
| | 1212 | + <li><?php aField( $conf, "DBschema", "Backwards-compatible UTF-8", "radio", "mysql4" ); ?></li> |
| | 1213 | + <li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "mysql5" ); ?></li> |
| | 1214 | + <li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 binary", "radio", "mysql5-binary" ); ?></li> |
| 1204 | 1215 | </ul> |
| 1205 | 1216 | </div> |
| 1206 | 1217 | <p class="config-desc"> |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -214,7 +214,9 @@ |
| 215 | 215 | in the autoblock_whitelist system message. |
| 216 | 216 | * Added placeholders for text injection by hooks to EditPage.php |
| 217 | 217 | * (bug 8009) Automatic edit summary for redirects is not filled for edits in existing pages |
| | 218 | +* Installer support for experimental MySQL 4.1/5.0 binary-safe schema |
| 218 | 219 | |
| | 220 | + |
| 219 | 221 | == Languages updated == |
| 220 | 222 | |
| 221 | 223 | * Bishnupriya Manipuri (bpy) |