summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorevgen@moonbone.local <>2007-03-02 00:10:25 +0300
committerevgen@moonbone.local <>2007-03-02 00:10:25 +0300
commit44f97f3f50b434245c6acda550d57e1497286d03 (patch)
tree21050e48fa1c5ce00614620b5107994fdb4d6cb5 /sql/sql_load.cc
parent360b063d3f9af7e8a7026a89611b801cca9975f3 (diff)
parent11588e5e4a64f01485fce6d5b566d47ef7d6b824 (diff)
downloadmariadb-git-44f97f3f50b434245c6acda550d57e1497286d03.tar.gz
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 8aa3f96fb95..4da861b8349 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -176,7 +176,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 as 'const table' (ie, one that has only one row).
*/
- if (unique_table(thd, table_list, table_list->next_global))
+ if (unique_table(thd, table_list, table_list->next_global, 0))
{
my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->table_name);
DBUG_RETURN(TRUE);