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 | d03ebe4b7967522b751fa1aaa46fed34ee52e054 (patch) | |
| tree | d8b5c28f76c34297cb383870257e988a7f1b8de7 /sql/sql_parse.cc | |
| parent | 4c5b904118d886832ad6d3c7403fb2cad72700b7 (diff) | |
| parent | 4a10f7b46c9ebbd9af89f37f64df40981459b788 (diff) | |
| download | mariadb-git-d03ebe4b7967522b751fa1aaa46fed34ee52e054.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_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index be722095a9c..dd7101a46bb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1220,8 +1220,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, table_list.alias= table_list.table_name= conv_name.str; packet= arg_end + 1; - if (!my_strcasecmp(system_charset_info, table_list.db, - INFORMATION_SCHEMA_NAME.str)) + if (is_infoschema_db(table_list.db, table_list.db_length)) { ST_SCHEMA_TABLE *schema_table= find_schema_table(thd, table_list.alias); if (schema_table) @@ -6279,8 +6278,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->force_index= test(table_options & TL_OPTION_FORCE_INDEX); ptr->ignore_leaves= test(table_options & TL_OPTION_IGNORE_LEAVES); ptr->derived= table->sel; - if (!ptr->derived && !my_strcasecmp(system_charset_info, ptr->db, - INFORMATION_SCHEMA_NAME.str)) + if (!ptr->derived && is_infoschema_db(ptr->db, ptr->db_length)) { ST_SCHEMA_TABLE *schema_table; if (ptr->updating && |