diff options
author | unknown <igor@rurik.mysql.com> | 2005-02-15 21:03:17 -0800 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2005-02-15 21:03:17 -0800 |
commit | 968e06a8040f87527ca54035b4e07ee69eda6083 (patch) | |
tree | f7e7b5491b05505e760919786421c7385a3a7e0b /sql/sql_delete.cc | |
parent | 69a6d4da0b778d231396a40ac9d696b9f0dacc27 (diff) | |
parent | d6157becb314900350d6f5589eaca7ce85741acf (diff) | |
download | mariadb-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.cc | 1 |
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)); |