database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/opt/local/work/mysql-5.0-merge

Browse Source 
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.
This commit is contained in:
unknown
2006-01-05 00:38:51 +03:00
parent bd88ee1aac 7bf8a9e6ca
commit 0b47dbfcdf
10 changed files with 118 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_show.cc
View File

@ -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);