diff options
author | unknown <evgen@moonbone.local> | 2007-03-02 00:10:25 +0300 |
---|---|---|
committer | unknown <evgen@moonbone.local> | 2007-03-02 00:10:25 +0300 |
commit | b72e3110da881f0bd94efd0e3b2a88b42138a478 (patch) | |
tree | 21050e48fa1c5ce00614620b5107994fdb4d6cb5 /sql/sql_update.cc | |
parent | a0684ef25f7b2a1f6f02abf3fe4d1f3d7ebb7298 (diff) | |
parent | 1437a9c532df2ff1f7dc5d72fdc50cdb89014c90 (diff) | |
download | mariadb-git-b72e3110da881f0bd94efd0e3b2a88b42138a478.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
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 4858184557b..89af1528970 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -640,7 +640,7 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, /* Check that we are not using table that we are updating in a sub select */ { TABLE_LIST *duplicate; - if ((duplicate= unique_table(thd, table_list, table_list->next_global))) + if ((duplicate= unique_table(thd, table_list, table_list->next_global, 0))) { update_non_unique_table_error(table_list, "UPDATE", duplicate); my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->table_name); @@ -867,7 +867,7 @@ reopen_tables: tl->lock_type != TL_READ_NO_INSERT) { TABLE_LIST *duplicate; - if ((duplicate= unique_table(thd, tl, table_list))) + if ((duplicate= unique_table(thd, tl, table_list, 0))) { update_non_unique_table_error(table_list, "UPDATE", duplicate); DBUG_RETURN(TRUE); @@ -1086,7 +1086,7 @@ static bool safe_update_on_fly(THD *thd, JOIN_TAB *join_tab, List<Item> *fields) { TABLE *table= join_tab->table; - if (unique_table(thd, table_ref, all_tables)) + if (unique_table(thd, table_ref, all_tables, 0)) return 0; switch (join_tab->type) { case JT_SYSTEM: |