Commit 6399db74 authored by kostja@bodhi.local's avatar kostja@bodhi.local

Fix a failure of lowercase_tables2 test on powermacg5, introduced

by the patch for Bug#4968
parent 51a2f515
...@@ -2500,6 +2500,7 @@ mysql_execute_command(THD *thd) ...@@ -2500,6 +2500,7 @@ mysql_execute_command(THD *thd)
if ((res= create_table_precheck(thd, tables, create_table))) if ((res= create_table_precheck(thd, tables, create_table)))
goto unsent_create_error; goto unsent_create_error;
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;
#else #else
...@@ -5800,7 +5801,6 @@ int create_table_precheck(THD *thd, TABLE_LIST *tables, ...@@ -5800,7 +5801,6 @@ int 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) ||
check_merge_table_access(thd, create_table->db, check_merge_table_access(thd, create_table->db,
......
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