diff options
| author | unknown <igor@rurik.mysql.com> | 2006-11-01 14:50:14 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-11-01 14:50:14 -0800 |
| commit | 0e69c252a17e6b5753079bc6313f2b7ac6fe1e66 (patch) | |
| tree | 21a8ce870c8dc48dc38623d1004a608f26e8b280 /sql/records.cc | |
| parent | 361f0468dba471aa0355214653244c14b3dd18a5 (diff) | |
| parent | 2a7cf59fc92ce322671bb687e2941275dd23d1c5 (diff) | |
| download | mariadb-git-0e69c252a17e6b5753079bc6313f2b7ac6fe1e66.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21727
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/records.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/records.cc b/sql/records.cc index 3e254fa3648..78473659b22 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -194,7 +194,7 @@ void end_read_record(READ_RECORD *info) } if (info->table) { - filesort_free_buffers(info->table); + filesort_free_buffers(info->table,0); (void) info->file->extra(HA_EXTRA_NO_CACHE); if (info->read_record != rr_quick) // otherwise quick_range does it (void) info->file->ha_index_or_rnd_end(); |