summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-02-15 21:03:17 -0800
committerunknown <igor@rurik.mysql.com>2005-02-15 21:03:17 -0800
commit968e06a8040f87527ca54035b4e07ee69eda6083 (patch)
treef7e7b5491b05505e760919786421c7385a3a7e0b /sql/sql_delete.cc
parent69a6d4da0b778d231396a40ac9d696b9f0dacc27 (diff)
parentd6157becb314900350d6f5589eaca7ce85741acf (diff)
downloadmariadb-git-968e06a8040f87527ca54035b4e07ee69eda6083.tar.gz
Manual merge
mysql-test/t/delete.test: Auto merged sql/sql_delete.cc: Auto merged
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 8b4a0f0f6d0..cecdf8d1c62 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -117,6 +117,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order,
bzero((char*) &tables,sizeof(tables));
tables.table = table;
+ tables.alias = table_list->alias;
table->sort.io_cache = (IO_CACHE *) my_malloc(sizeof(IO_CACHE),
MYF(MY_FAE | MY_ZEROFILL));