diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-03-23 20:40:35 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-03-23 20:40:35 +0100 |
| commit | d9a56f91297e2f4a43fbffd4d9c01ec01cba2023 (patch) | |
| tree | 600319f331d90884fcd8205fc6d7afcedaf1f080 /sql/sql_view.cc | |
| parent | 10d2528a332c47a4c43704852de1bff804ba23ca (diff) | |
| parent | b765a8af9bb0417a8bbb12cef44014de9badd938 (diff) | |
| download | mariadb-git-d9a56f91297e2f4a43fbffd4d9c01ec01cba2023.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into sin.intern.azundris.com:/home/tnurnberg/26817/50-26817
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 cb3570105a7..4ff41487771 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1014,6 +1014,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; } @@ -1039,7 +1044,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)) |