1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge mysql.com:/home/mydev/mysql-5.0

into  mysql.com:/home/mydev/mysql-5.0-bug5390
This commit is contained in:
ingo@mysql.com
2005-12-27 10:31:00 +01:00
12 changed files with 219 additions and 41 deletions

View File

@@ -2835,7 +2835,7 @@ mysql_execute_command(THD *thd)
if (!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))
{
TABLE_LIST *duplicate;
if ((duplicate= unique_table(create_table, select_tables)))
if ((duplicate= unique_table(thd, create_table, select_tables)))
{
update_non_unique_table_error(create_table, "CREATE", duplicate);
res= 1;
@@ -2851,7 +2851,7 @@ mysql_execute_command(THD *thd)
tab= tab->next_local)
{
TABLE_LIST *duplicate;
if ((duplicate= unique_table(tab, select_tables)))
if ((duplicate= unique_table(thd, tab, select_tables)))
{
update_non_unique_table_error(tab, "CREATE", duplicate);
res= 1;