| Index: trunk/phase3/config/index.php |
| — | — | @@ -602,7 +602,7 @@ |
| 603 | 603 | ## MySQL specific: |
| 604 | 604 | $conf->DBprefix = importPost( "DBprefix" ); |
| 605 | 605 | $conf->setSchema( |
| 606 | | - importPost( "DBschema", "mysql4" ), |
| | 606 | + importPost( "DBschema", "mysql5-binary" ), |
| 607 | 607 | importPost( "DBengine", "InnoDB" ) ); |
| 608 | 608 | |
| 609 | 609 | ## Postgres specific: |
| — | — | @@ -1421,16 +1421,17 @@ |
| 1422 | 1422 | <div class="config-input"><label class="column">Database character set</label> |
| 1423 | 1423 | <div>Select one:</div> |
| 1424 | 1424 | <ul class="plain"> |
| 1425 | | - <li><?php aField( $conf, "DBschema", "Backwards-compatible UTF-8", "radio", "mysql4" ); ?></li> |
| 1426 | | - <li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "mysql5" ); ?></li> |
| 1427 | | - <li><?php aField( $conf, "DBschema", "Experimental MySQL 4.1/5.0 binary", "radio", "mysql5-binary" ); ?></li> |
| | 1425 | + <li><?php aField( $conf, "DBschema", "MySQL 4.1/5.0 binary", "radio", "mysql5-binary" ); ?></li> |
| | 1426 | + <li><?php aField( $conf, "DBschema", "MySQL 4.1/5.0 UTF-8", "radio", "mysql5" ); ?></li> |
| | 1427 | + <li><?php aField( $conf, "DBschema", "MySQL 4.0 backwards-compatible UTF-8", "radio", "mysql4" ); ?></li> |
| 1428 | 1428 | </ul> |
| 1429 | 1429 | </div> |
| 1430 | 1430 | <p class="config-desc"> |
| 1431 | | - <b>EXPERIMENTAL:</b> You can enable explicit Unicode charset support |
| 1432 | | - for MySQL 4.1 and 5.0 servers. This is not well tested and may |
| 1433 | | - cause things to break. <b>If upgrading an older installation, leave |
| 1434 | | - in backwards-compatible mode.</b> |
| | 1431 | + This option is ignored on upgrade, the same character set will be kept. |
| | 1432 | + <br/><br/> |
| | 1433 | + <b>WARNING:</b> If you use <b>backwards-compatible UTF-8</b> on MySQL 4.1+, and subsequently back up the database with <tt>mysqldump</tt>, it may destroy all non-ASCII characters, irreversibly corrupting your backups!. |
| | 1434 | + <br/><br/> |
| | 1435 | + In <b>binary mode</b>, MediaWiki stores UTF-8 text to the database in binary fields. This is more efficient than MySQL's UTF-8 mode, and allows you to use the full range of Unicode characters. In <b>UTF-8 mode</b>, MySQL will know what character set your data is in, and can present and convert it appropriately, but it won't let you store characters above the <a target="_blank" href="http://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes">Basic Multilingual Plane</a>. |
| 1435 | 1436 | </p> |
| 1436 | 1437 | </fieldset> |
| 1437 | 1438 | |