diff options
author | jonas@perch.ndb.mysql.com <> | 2006-10-27 23:59:04 +0200 |
---|---|---|
committer | jonas@perch.ndb.mysql.com <> | 2006-10-27 23:59:04 +0200 |
commit | b67e5b1131347ff3238afe9cce2b55e3a73e03f1 (patch) | |
tree | f889acd576801cb9684216e89bef21cc73e9be2f /sql/sql_delete.cc | |
parent | 3b726b2845ed10ea46db8ee3d719780d71bfbb0d (diff) | |
parent | 837746340e890fb65a9606f26988d2789db755d5 (diff) | |
download | mariadb-git-b67e5b1131347ff3238afe9cce2b55e3a73e03f1.tar.gz |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 8ee6274ff11..87a6575cc64 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -172,7 +172,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, MYF(MY_FAE | MY_ZEROFILL)); if (!(sortorder= make_unireg_sortorder((ORDER*) order->first, - &length)) || + &length, NULL)) || (table->sort.found_records = filesort(thd, table, sortorder, length, select, HA_POS_ERROR, &examined_rows)) |