summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-07-03 19:23:29 +0300
committerunknown <monty@narttu.mysql.fi>2003-07-03 19:23:29 +0300
commit25cd10cb877d6c2d15b5f64c0271b22aa88e394f (patch)
tree552d3f1201273b81e2e68895bb64d870a4a146ac /sql
parentabe124e76bc12d3cefe5502ad1799461090c7365 (diff)
parentfd0ecf1e47baca9e288e8cf038ca731962afdf14 (diff)
downloadmariadb-git-25cd10cb877d6c2d15b5f64c0271b22aa88e394f.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_update.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index b4e7750addf..3179c8e0f24 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -86,7 +86,8 @@ int mysql_update(THD *thd,
table->grant.want_privilege=(SELECT_ACL & ~table->grant.privilege);
bzero((char*) &tables,sizeof(tables)); // For ORDER BY
- tables.table = table;
+ tables.table= table;
+ tables.alias= table_list->alias;
if (setup_tables(table_list) || setup_conds(thd,table_list,&conds) ||
setup_order(thd, &tables, all_fields, all_fields, order) ||