database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.0-opt

Browse Source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21798-5.0-opt-merge
This commit is contained in:
gkodinov/kgeorge@macbook.gmz
2006-10-17 16:36:44 +03:00
parent 52dacf7c9a f7b8937661
commit a64ae1844d
8 changed files with 104 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@ -311,7 +311,7 @@ int mysql_update(THD *thd,
table->sort.io_cache = (IO_CACHE *) my_malloc(sizeof(IO_CACHE),
MYF(MY_FAE | MY_ZEROFILL));
if (!(sortorder=make_unireg_sortorder(order, &length)) ||
if (!(sortorder=make_unireg_sortorder(order, &length, NULL)) ||
(table->sort.found_records = filesort(thd, table, sortorder, length,
select, limit,
&examined_rows))