diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-01-19 12:45:34 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-01-19 12:45:34 +0200 |
| commit | 409f0ed83a8dfb04a3c2193238000ae56ebca2f4 (patch) | |
| tree | b5db381b58092914e3d75f0a4165b4d94061ba42 /sql/sql_db.cc | |
| parent | a3b4065d9081131c56dd6dd6a93b02fb47efb0cc (diff) | |
| parent | baacdf1dae688fc148967acf20bf1ef79b3f7c01 (diff) | |
| download | mariadb-git-409f0ed83a8dfb04a3c2193238000ae56ebca2f4.tar.gz | |
merge
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index e760fae41f6..22ecaa17a0c 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -618,7 +618,7 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, DBUG_ENTER("mysql_create_db"); /* do not create 'information_schema' db */ - if (!my_strcasecmp(system_charset_info, db, INFORMATION_SCHEMA_NAME.str)) + if (is_schema_db(db, strlen(db))) { my_error(ER_DB_CREATE_EXISTS, MYF(0), db); DBUG_RETURN(-1); @@ -1557,8 +1557,7 @@ bool mysql_change_db(THD *thd, const LEX_STRING *new_db_name, bool force_switch) } } - if (my_strcasecmp(system_charset_info, new_db_name->str, - INFORMATION_SCHEMA_NAME.str) == 0) + if (is_schema_db(new_db_name->str, new_db_name->length)) { /* Switch the current database to INFORMATION_SCHEMA. */ |