diff options
| author | unknown <konstantin@mysql.com> | 2006-01-05 00:38:51 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-01-05 00:38:51 +0300 |
| commit | 0b47dbfcdfccff7dd8a9eba2e39c32677bc3a642 (patch) | |
| tree | 640ca9d3de9d7d3d7a25fc3b4c5affabfdee1487 /sql/sql_show.cc | |
| parent | bd88ee1aac8f45797dcd90802b1917b568982c3e (diff) | |
| parent | 7bf8a9e6cafbaaf3ee71724a29bbd3880a30fea6 (diff) | |
| download | mariadb-git-0b47dbfcdfccff7dd8a9eba2e39c32677bc3a642.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-5.0-merge
into mysql.com:/opt/local/work/mysql-5.1-merge
include/config-win.h:
Auto merged
mysys/hash.c:
Auto merged
mysql-test/r/rpl_stm_sp.result:
Auto merged
mysql-test/t/rpl_stm_sp.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/t/information_schema.test:
Manual merge.
sql/lock.cc:
Manual merge.
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 705ebb4aef3..cd0df5184cd 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2238,6 +2238,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); @@ -2423,6 +2425,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); |