From: Date: March 23 2007 8:40pm Subject: bk commit into 5.0 tree (tnurnberg:1.2490) List-Archive: http://lists.mysql.com/commits/22870 Message-Id: Below is the list of changes that have just been committed into a local 5.0 repository of tnurnberg. When tnurnberg does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-03-23 20:40:35+01:00, tnurnberg@stripped +1 -0 Merge tnurnberg@stripped:/home/bk/mysql-5.0-marvel into sin.intern.azundris.com:/home/tnurnberg/26817/50-26817 MERGE: 1.2485.1.1 sql/sql_view.cc@stripped, 2007-03-23 20:40:30+01:00, tnurnberg@stripped +0 -0 Auto merged MERGE: 1.105.1.1 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: tnurnberg # Host: sin.intern.azundris.com # Root: /home/tnurnberg/26817/50-26817/RESYNC --- 1.106/sql/sql_view.cc 2007-03-21 22:34:11 +01:00 +++ 1.107/sql/sql_view.cc 2007-03-23 20:40:30 +01:00 @@ -1014,6 +1014,11 @@ bool mysql_make_view(THD *thd, File_pars 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_pars } } 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))