diff options
author | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
commit | a45ea00b32a71ef5d123e102a7379f7d79a3dbbb (patch) | |
tree | 0bf2d7fce335a1c38da55def00c6bfc5304db2ee /sql/table.cc | |
parent | ad935d47088485c59e6425347307b7b908790e3d (diff) | |
parent | 619037517f6827131f0f6367df57e28d1b695626 (diff) | |
download | mariadb-git-a45ea00b32a71ef5d123e102a7379f7d79a3dbbb.tar.gz |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sys_vars.cc
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/table.cc b/sql/table.cc index c0c365f4901..3e2e5adc2c7 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -215,10 +215,7 @@ TABLE_CATEGORY get_table_category(const LEX_STRING *db, const LEX_STRING *name) DBUG_ASSERT(db != NULL); DBUG_ASSERT(name != NULL); - if ((db->length == INFORMATION_SCHEMA_NAME.length) && - (my_strcasecmp(system_charset_info, - INFORMATION_SCHEMA_NAME.str, - db->str) == 0)) + if (is_infoschema_db(db->str, db->length)) return TABLE_CATEGORY_INFORMATION; if ((db->length == PERFORMANCE_SCHEMA_DB_NAME.length) && @@ -3941,7 +3938,8 @@ const char *Natural_join_column::db_name() DBUG_ASSERT(!strcmp(table_ref->db, table_ref->table->s->db.str) || (table_ref->schema_table && - is_infoschema_db(table_ref->table->s->db.str))); + is_infoschema_db(table_ref->table->s->db.str, + table_ref->table->s->db.length))); return table_ref->db; } @@ -4159,7 +4157,8 @@ const char *Field_iterator_table_ref::get_db_name() */ DBUG_ASSERT(!strcmp(table_ref->db, table_ref->table->s->db.str) || (table_ref->schema_table && - is_infoschema_db(table_ref->table->s->db.str))); + is_infoschema_db(table_ref->table->s->db.str, + table_ref->table->s->db.length))); return table_ref->db; } |