diff options
author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-04-17 13:46:27 +0500 |
---|---|---|
committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-04-17 13:46:27 +0500 |
commit | 65e3d360f9daa12bd882288dd82ccdb02b05b613 (patch) | |
tree | 73c578f3915524ff84b1c7ea535cfee31f320169 /sql | |
parent | 2cdc1c6150407de71166db387814887759fe360e (diff) | |
parent | 4fbfa8db451b10b409eb4dd4ba985552c4a86a95 (diff) | |
download | mariadb-git-65e3d360f9daa12bd882288dd82ccdb02b05b613.tar.gz |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_handler.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 9c8bba6208c..16810e29343 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -199,6 +199,14 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen) tables->db, tables->table_name, tables->alias, (int) reopen)); + if (tables->schema_table) + { + my_error(ER_WRONG_USAGE, MYF(0), "HANDLER OPEN", + INFORMATION_SCHEMA_NAME.str); + DBUG_PRINT("exit",("ERROR")); + DBUG_RETURN(TRUE); + } + if (! hash_inited(&thd->handler_tables_hash)) { /* |