diff options
| author | unknown <serg@serg.mylan> | 2006-01-07 14:50:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-07 14:50:03 +0100 |
| commit | 4770190ab808b17c014d205a0320f4c42e93598e (patch) | |
| tree | a6b97cdc61401b4f6ed3844e3fb547844bfb11b1 /sql/sql_show.cc | |
| parent | 031ee043fb88f033c430df1c3c1890f8ea40d7e8 (diff) | |
| parent | d8dccc31058e8448e18981308395aac890cc4224 (diff) | |
| download | mariadb-git-4770190ab808b17c014d205a0320f4c42e93598e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 0de02337fff..c1165f2c4b5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2153,6 +2153,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) int error= 1; enum legacy_db_type not_used; Open_tables_state open_tables_state_backup; + bool save_view_prepare_mode= lex->view_prepare_mode; + lex->view_prepare_mode= TRUE; DBUG_ENTER("get_all_tables"); LINT_INIT(end); @@ -2338,6 +2340,7 @@ err: lex->derived_tables= derived_tables; lex->all_selects_list= old_all_select_lex; lex->query_tables_last= save_query_tables_last; + lex->view_prepare_mode= save_view_prepare_mode; *save_query_tables_last= 0; lex->sql_command= save_sql_command; DBUG_RETURN(error); |