diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-03-06 11:30:08 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-03-06 11:30:08 -0700 |
| commit | 307c9f1e8ff9eb455ba86a08c45862773cd1f9d8 (patch) | |
| tree | 2ab466ff32d7fa9c1e75823809ef9548dde1f137 /sql/table.cc | |
| parent | a6b09226226b19f801f9c3c6c73ce84718e5fccf (diff) | |
| parent | 266a7fff520eb2253226158df236865f2ad16ffe (diff) | |
| download | mariadb-git-307c9f1e8ff9eb455ba86a08c45862773cd1f9d8.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_b
mysql-test/r/view.result:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/sql_base.cc:
Manual merge
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 970f5b2267c..960534bf7d4 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2080,7 +2080,9 @@ void st_table_list::hide_view_error(THD *thd) thd->net.last_errno == ER_SP_DOES_NOT_EXIST || thd->net.last_errno == ER_PROCACCESS_DENIED_ERROR || thd->net.last_errno == ER_COLUMNACCESS_DENIED_ERROR || - thd->net.last_errno == ER_TABLEACCESS_DENIED_ERROR) + thd->net.last_errno == ER_TABLEACCESS_DENIED_ERROR || + thd->net.last_errno == ER_TABLE_NOT_LOCKED || + thd->net.last_errno == ER_NO_SUCH_TABLE) { TABLE_LIST *top= top_table(); thd->clear_error(); |