diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2007-04-04 21:25:39 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2007-04-04 21:25:39 +0300 |
| commit | e40d3631a3e22e73a7c96a1e51f9606c0747c00b (patch) | |
| tree | cc30c4ae4bc34be9ddaaefb3115063e656e0f198 /sql/table.cc | |
| parent | 49d0b0caeedb1d94dbcf7b3868e232d3bf069d01 (diff) | |
| parent | 6b61a50991f6dd5ab1d96c8b63b373c8d24b5b83 (diff) | |
| download | mariadb-git-e40d3631a3e22e73a7c96a1e51f9606c0747c00b.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 71e510bf0ac..7d48dbd5ca0 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2961,7 +2961,7 @@ void st_table_list::hide_view_error(THD *thd) thd->net.last_errno == ER_NO_SUCH_TABLE) { TABLE_LIST *top= top_table(); - thd->clear_error(); + thd->clear_error(); my_error(ER_VIEW_INVALID, MYF(0), top->view_db.str, top->view_name.str); } else if (thd->net.last_errno == ER_NO_DEFAULT_FOR_FIELD) @@ -3317,7 +3317,8 @@ bool st_table_list::prepare_view_securety_context(THD *thd) definer.host.str, thd->db)) { - if (thd->lex->sql_command == SQLCOM_SHOW_CREATE) + if ((thd->lex->sql_command == SQLCOM_SHOW_CREATE) || + (thd->lex->sql_command == SQLCOM_SHOW_FIELDS)) { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_NO_SUCH_USER, |