diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:24:33 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 22:24:33 +0300 |
| commit | 1375821c8d15a4a34aea697db534ac5a0407d699 (patch) | |
| tree | d8b5c28f76c34297cb383870257e988a7f1b8de7 /sql/sql_show.cc | |
| parent | fa3f3beadcb8efd07a87ee32a8e52dde071d5ad1 (diff) | |
| parent | ed79d2ecbbb6b88d328dd32cba3e53051744e9dc (diff) | |
| download | mariadb-git-1375821c8d15a4a34aea697db534ac5a0407d699.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/events.cc
- sql/mysql_priv.h
- sql/repl_failsafe.cc
- sql/sql_db.cc
- sql/sql_parse.cc
- sql/sql_show.cc
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index f8df7eb518f..bc66c8cd7ac 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -750,8 +750,7 @@ bool mysqld_show_create_db(THD *thd, char *dbname, DBUG_RETURN(TRUE); } #endif - if (!my_strcasecmp(system_charset_info, dbname, - INFORMATION_SCHEMA_NAME.str)) + if (is_infoschema_db(dbname)) { dbname= INFORMATION_SCHEMA_NAME.str; create.default_table_charset= system_charset_info; @@ -2686,8 +2685,8 @@ int make_db_list(THD *thd, List<LEX_STRING> *files, */ if (lookup_field_vals->db_value.str) { - if (!my_strcasecmp(system_charset_info, INFORMATION_SCHEMA_NAME.str, - lookup_field_vals->db_value.str)) + if (is_infoschema_db(lookup_field_vals->db_value.str, + lookup_field_vals->db_value.length)) { *with_i_schema= 1; if (files->push_back(i_s_name_copy)) |