jenkins-bot has submitted this change and it was merged.
Change subject: MysqlInstaller: use default character set of utf8
......................................................................
MysqlInstaller: use default character set of utf8
Bug: 14931
Change-Id: Ied512a75d17b401206b6439f289fe36c01536cec
---
M RELEASE-NOTES-1.22
M includes/installer/MysqlInstaller.php
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 44b1d36..4fb948a 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -312,6 +312,8 @@
* (bug 26811) On DB error pages, server hostnames are now hidden when both
$wgShowHostnames and $wgShowSQLErrors are false.
* (bug 6200) line breaks in <blockquote> are handled like they are in <div>
+* (bug 14931) Default character set now set to 'utf8' when a new MySQL
+ database is created.
=== API changes in 1.22 ===
* (bug 25553) The JSON output formatter now leaves forward slashes unescaped
diff --git a/includes/installer/MysqlInstaller.php
b/includes/installer/MysqlInstaller.php
index e0bf3d7..c0b5243 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -89,8 +89,10 @@
return $this->getTextBox( 'wgDBserver', 'config-db-host',
array(), $this->parent->getHelpBox( 'config-db-host-help' ) ) .
Html::openElement( 'fieldset' ) .
Html::element( 'legend', array(), wfMessage(
'config-db-wiki-settings' )->text() ) .
- $this->getTextBox( 'wgDBname', 'config-db-name', array(
'dir' => 'ltr' ), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
- $this->getTextBox( 'wgDBprefix', 'config-db-prefix',
array( 'dir' => 'ltr' ), $this->parent->getHelpBox( 'config-db-prefix-help' ) )
.
+ $this->getTextBox( 'wgDBname', 'config-db-name', array(
'dir' => 'ltr' ),
+ $this->parent->getHelpBox(
'config-db-name-help' ) ) .
+ $this->getTextBox( 'wgDBprefix', 'config-db-prefix',
array( 'dir' => 'ltr' ),
+ $this->parent->getHelpBox(
'config-db-prefix-help' ) ) .
Html::closeElement( 'fieldset' ) .
$this->getInstallUserBox();
}
@@ -475,7 +477,7 @@
$conn = $status->value;
$dbName = $this->getVar( 'wgDBname' );
if ( !$conn->selectDB( $dbName ) ) {
- $conn->query( "CREATE DATABASE " .
$conn->addIdentifierQuotes( $dbName ), __METHOD__ );
+ $conn->query( "CREATE DATABASE " .
$conn->addIdentifierQuotes( $dbName ) . "CHARACTER SET utf8", __METHOD__ );
$conn->selectDB( $dbName );
}
$this->setupSchemaVars();
--
To view, visit https://gerrit.wikimedia.org/r/67422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied512a75d17b401206b6439f289fe36c01536cec
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Karun <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: PleaseStand <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
