diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-28 00:10:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-28 00:10:37 +0300 |
| commit | f6202ca6e25c8138d81fd37e23d3ce8509770cf9 (patch) | |
| tree | be09994bcfa8f4152e04932dbfeb0f933530ccb0 /sql/sql_db.cc | |
| parent | b8094a8e01ab1f12ecffa1e6646d0d25d14e2935 (diff) | |
| parent | 409f0ed83a8dfb04a3c2193238000ae56ebca2f4 (diff) | |
| download | mariadb-git-f6202ca6e25c8138d81fd37e23d3ce8509770cf9.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/event_data_objects.cc
- sql/events.cc
- sql/mysql_priv.h
- sql/repl_failsafe.cc
- sql/sql_parse.cc
- sql/sql_show.cc
- sql/sql_view.cc
- sql/table.cc
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 9fef7114898..fe38afb0521 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -645,7 +645,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_infoschema_db(db, strlen(db))) { my_error(ER_DB_CREATE_EXISTS, MYF(0), db); DBUG_RETURN(-1); @@ -1600,8 +1600,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_infoschema_db(new_db_name->str, new_db_name->length)) { /* Switch the current database to INFORMATION_SCHEMA. */ |