Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M. Turek <me@derrabus.de>2004-04-17 07:07:15 +0400
committerAlexander M. Turek <me@derrabus.de>2004-04-17 07:07:15 +0400
commit860282b78920d2f508498031fa8fa7ddd47595f3 (patch)
tree83f6a3ba52e81abe7faf97b004018d8901e36a0f /db_create.php
parent4f2be967ed3393fe9edabc92fa8b4624b3f31594 (diff)
more collation stuff
Diffstat (limited to 'db_create.php')
-rw-r--r--db_create.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/db_create.php b/db_create.php
index 653dbf71ac..c2c25dc00c 100644
--- a/db_create.php
+++ b/db_create.php
@@ -27,7 +27,7 @@ $sql_query = 'CREATE DATABASE ' . PMA_backquote($db);
if (!empty($db_collation) && PMA_MYSQL_INT_VERSION >= 40101) {
list($db_charset) = explode('_', $db_collation);
if (in_array($db_charset, $mysql_charsets) && in_array($db_collation, $mysql_collations[$db_charset])) {
- $sql_query .= ' DEFAULT CHARACTER SET ' . $db_charset . ($db_charset == $db_collation ? '' : ' COLLATE ' . $db_collation);
+ $sql_query .= ' DEFAULT' . PMA_generateCharsetQueryPart($db_collation);
}
unset($db_charset, $db_collation);
}