database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql
This commit is contained in:
evgen@moonbone.local
2007-03-02 00:10:25 +03:00
parent 360b063d3f 11588e5e4a
commit 44f97f3f50
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_load.cc
View File

@ -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);