diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
| commit | 9c030fe5081163babdc8ef24395d108a394107fe (patch) | |
| tree | 16fe2efa0a3d5e40e00972a1dc3bc4e13f71170c /sql/table.cc | |
| parent | 0b2f51664d38ed24f3f8b237877520e45bfe83f6 (diff) | |
| parent | 19df110369d4cef5303176a8aedca34cd0e2d271 (diff) | |
| download | mariadb-git-9c030fe5081163babdc8ef24395d108a394107fe.tar.gz | |
Merge next-mr -> next-4284.
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 db7137f41c2..514ea865e8c 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) && @@ -3933,7 +3930,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; } @@ -4151,7 +4149,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; } |