summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysql
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-04-03 19:54:49 +0200
committerAndrey Andreev <narf@bofh.bg>2012-04-03 19:54:49 +0200
commitfd105ab7f05e64c0d9188e43c6fd6a2bb2c6cf7f (patch)
treed16dc16ae5e81f6171a18b3278d48038406937bd /system/database/drivers/mysql
parent5b46f42d654e7474a47ecfd9f7dafece98ee668e (diff)
parentab1d568b7b7bce779cd00c90cd99c6f43747575b (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-postgre
Diffstat (limited to 'system/database/drivers/mysql')
-rw-r--r--system/database/drivers/mysql/mysql_forge.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php
index 11172b41b..9e19de1bb 100644
--- a/system/database/drivers/mysql/mysql_forge.php
+++ b/system/database/drivers/mysql/mysql_forge.php
@@ -42,7 +42,7 @@ class CI_DB_mysql_forge extends CI_DB_forge {
*/
public function _create_database($name)
{
- return 'CREATE DATABASE '.$name;
+ return 'CREATE DATABASE '.$name.' CHARACTER SET '.$this->db->char_set.' COLLATE '.$this->db->dbcollat;
}
// --------------------------------------------------------------------