diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-10-27 23:59:04 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-10-27 23:59:04 +0200 |
| commit | 5d10a44537459a4e478dba86c7913e8c5e541b8d (patch) | |
| tree | f889acd576801cb9684216e89bef21cc73e9be2f /sql/sql_delete.cc | |
| parent | 16d6c0b23643a1bbf13a2dfcd4d4a75e193a351b (diff) | |
| parent | 69c7200219dd2010de7ca33d89432aff4fbd9e3a (diff) | |
| download | mariadb-git-5d10a44537459a4e478dba86c7913e8c5e541b8d.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
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
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)) |