diff options
| author | unknown <serg@sergbook.mysql.com> | 2007-03-24 17:16:53 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2007-03-24 17:16:53 +0200 |
| commit | 99d1dee47301ba8313dd6fadeaabedcf60c38d27 (patch) | |
| tree | b9c03afd33f12eacdee1a66fbe3bd8f2a850b5dd /sql/sql_view.cc | |
| parent | aa42093553ad7b066b96ca3e49facc02b6b8981e (diff) | |
| parent | 79bfd0b958f4bade19e0f49ae379b6502cc145fe (diff) | |
| download | mariadb-git-99d1dee47301ba8313dd6fadeaabedcf60c38d27.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 533e847682d..14d9aeb4df5 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1018,6 +1018,11 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, CHARSET_INFO *save_cs= thd->variables.character_set_client; thd->variables.character_set_client= system_charset_info; res= MYSQLparse((void *)thd); + + if ((old_lex->sql_command == SQLCOM_SHOW_FIELDS) || + (old_lex->sql_command == SQLCOM_SHOW_CREATE)) + lex->sql_command= old_lex->sql_command; + thd->variables.character_set_client= save_cs; thd->variables.sql_mode= save_mode; } @@ -1043,7 +1048,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, } } else if (!table->prelocking_placeholder && - old_lex->sql_command == SQLCOM_SHOW_CREATE && + (old_lex->sql_command == SQLCOM_SHOW_CREATE) && !table->belong_to_view) { if (check_table_access(thd, SHOW_VIEW_ACL, table, 0)) |