diff options
| author | unknown <pem@mysql.com> | 2003-04-16 23:23:23 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-04-16 23:23:23 +0200 |
| commit | 36752387c1f0d5e6657094057a818942383aa0a0 (patch) | |
| tree | d3271278f467f9e28c64cdd1d735e7f850b5df5e /sql/sql_update.cc | |
| parent | cfd69393e4195e55412778a9d60c7eb99c87de4c (diff) | |
| parent | df5ff1daeae5b07019afe4a0e820984d069071a6 (diff) | |
| download | mariadb-git-36752387c1f0d5e6657094057a818942383aa0a0.tar.gz | |
Merged 4.1 into 5.0.
client/mysql.cc:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index b96ddded8d1..6aef7088bfd 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -399,6 +399,7 @@ int mysql_multi_update(THD *thd, table_list->grant.want_privilege=(SELECT_ACL & ~table_list->grant.privilege); if ((res=open_and_lock_tables(thd,table_list))) DBUG_RETURN(res); + fix_tables_pointers(thd->lex.all_selects_list); thd->select_limit=HA_POS_ERROR; if (setup_fields(thd, 0, table_list, *fields, 1, 0, 0)) @@ -407,7 +408,7 @@ int mysql_multi_update(THD *thd, /* Count tables and setup timestamp handling */ - for (tl= (TABLE_LIST*) table_list ; tl ; tl=tl->next) + for (tl= select_lex->get_table_list() ; tl ; tl=tl->next) { TABLE *table= tl->table; if (table->timestamp_field) @@ -425,7 +426,8 @@ int mysql_multi_update(THD *thd, List<Item> total_list; res= mysql_select(thd, &select_lex->ref_pointer_array, - table_list, select_lex->with_wild, total_list, + select_lex->get_table_list(), select_lex->with_wild, + total_list, conds, 0, (ORDER *) NULL, (ORDER *)NULL, (Item *) NULL, (ORDER *)NULL, options | SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK, |