diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-24 00:09:23 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-24 00:09:23 +0300 |
| commit | 7b5f5d5c37b0a59a04645007cc44446274666832 (patch) | |
| tree | 5e503468493119925995d64ea920534747a99d04 /sql/table.cc | |
| parent | 12318ab2a3a80b2230de8c7d98060b41a6972e25 (diff) | |
| parent | ed79d2ecbbb6b88d328dd32cba3e53051744e9dc (diff) | |
| download | mariadb-git-7b5f5d5c37b0a59a04645007cc44446274666832.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index a1a422028d4..6841efee54e 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -212,10 +212,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_schema_db(db->str, db->length)) { return TABLE_CATEGORY_INFORMATION; } |