diff options
author | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-19 20:14:35 +0300 |
---|---|---|
committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-19 20:14:35 +0300 |
commit | 6d0a048701e07e69dea899fc1a6caa8f5d6b435d (patch) | |
tree | 095650183fd0ccdaa33b61c73f3a08954efac80b /sql/sql_update.cc | |
parent | 3808546d8a67d62420f9111998d94e44050ac313 (diff) | |
parent | 513917a53f87ce43dea98838a7d4e6196b9ea82b (diff) | |
download | mariadb-git-6d0a048701e07e69dea899fc1a6caa8f5d6b435d.tar.gz |
merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r-- | sql/sql_update.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 5a6b5523cd3..c8bc8f87340 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -91,6 +91,7 @@ int mysql_update(THD *thd, bzero((char*) &tables,sizeof(tables)); // For ORDER BY tables.table= table; + tables.alias= table_list->alias; if (setup_tables(update_table_list) || setup_conds(thd,update_table_list,&conds) || |