diff options
author | ingo@mysql.com <> | 2005-12-22 13:48:00 +0100 |
---|---|---|
committer | ingo@mysql.com <> | 2005-12-22 13:48:00 +0100 |
commit | a04c5adb0b270ee20fc70b369fa6acb44d58d129 (patch) | |
tree | 5783625379cf6830fb59d45ba9d6da422912c443 /sql/sql_load.cc | |
parent | 7b8fa1e3c6d38efb6bccf6776eb86942e28e496f (diff) | |
download | mariadb-git-a04c5adb0b270ee20fc70b369fa6acb44d58d129.tar.gz |
BUG#5390 - problems with merge tables
Problem #1: INSERT...SELECT, Version for 5.1.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 70abe3e659c..3850e704718 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -178,7 +178,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, table is marked to be 'used for insert' in which case we should never mark this table as 'const table' (ie, one that has only one row). */ - if (unique_table(table_list, table_list->next_global)) + if (unique_table(thd, table_list, table_list->next_global)) { my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->table_name); DBUG_RETURN(TRUE); |