Commit eeaf11b2 authored by unknown's avatar unknown

Merge bodhi.local:/opt/local/work/mysql-4.1-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max


sql/sql_parse.cc:
  SCCS merged
parents 06bc6836 f7e41bae
...@@ -2914,6 +2914,7 @@ mysql_execute_command(THD *thd) ...@@ -2914,6 +2914,7 @@ mysql_execute_command(THD *thd)
if ((res= create_table_precheck(thd, select_tables, create_table))) if ((res= create_table_precheck(thd, select_tables, create_table)))
goto end_with_restore_list; goto end_with_restore_list;
create_info.alias= create_table->alias;
#ifndef HAVE_READLINK #ifndef HAVE_READLINK
create_info.data_file_name= create_info.index_file_name= NULL; create_info.data_file_name= create_info.index_file_name= NULL;
...@@ -7373,7 +7374,6 @@ bool create_table_precheck(THD *thd, TABLE_LIST *tables, ...@@ -7373,7 +7374,6 @@ bool create_table_precheck(THD *thd, TABLE_LIST *tables,
want_priv= ((lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) ? want_priv= ((lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) ?
CREATE_TMP_ACL : CREATE_ACL); CREATE_TMP_ACL : CREATE_ACL);
lex->create_info.alias= create_table->alias;
if (check_access(thd, want_priv, create_table->db, if (check_access(thd, want_priv, create_table->db,
&create_table->grant.privilege, 0, 0, &create_table->grant.privilege, 0, 0,
test(create_table->schema_table)) || test(create_table->schema_table)) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment