1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

recovery from 5.0 merge for bug18676

mysql-test/r/ndb_autodiscover.result:
  recovery for bug#18676 merge in 5.0
sql/ha_ndbcluster.cc:
  recovery for bug#18676 merge in 5.0
sql/handler.cc:
  recovery for bug#18676 merge in 5.0
sql/sql_table.cc:
  recovery for bug#18676 merge in 5.0
This commit is contained in:
unknown
2007-04-04 15:22:37 +08:00
parent 5ca5d5dee2
commit ee58034fc9
4 changed files with 7 additions and 7 deletions

View File

@ -3439,7 +3439,6 @@ bool mysql_create_table_internal(THD *thd,
error= 0;
goto err;
}
DBUG_PRINT("info",("1"));
my_error(ER_TABLE_EXISTS_ERROR, MYF(0), alias);
goto err;
}
@ -3451,7 +3450,6 @@ bool mysql_create_table_internal(THD *thd,
{
if (create_info->options & HA_LEX_CREATE_IF_NOT_EXISTS)
goto warn;
DBUG_PRINT("info",("2"));
my_error(ER_TABLE_EXISTS_ERROR,MYF(0),table_name);
goto unlock_and_end;
}