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/sql_show.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/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4469bbacf90..d859db03437 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3977,7 +3977,7 @@ bool get_schema_tables_result(JOIN *join) table_list->table->file->extra(HA_EXTRA_RESET_STATE); table_list->table->file->delete_all_rows(); free_io_cache(table_list->table); - filesort_free_buffers(table_list->table); + filesort_free_buffers(table_list->table,1); table_list->table->null_row= 0; } else |