diff options
| author | holyfoot/hf@deer.(none) <> | 2006-11-08 19:09:39 +0400 |
|---|---|---|
| committer | holyfoot/hf@deer.(none) <> | 2006-11-08 19:09:39 +0400 |
| commit | 938ba3e11e5572437229427e9568660246b12de3 (patch) | |
| tree | 533737794921f247b2bb1a19b363f96a1c6b22c6 /sql/records.cc | |
| parent | d947f1c84722b5ddfe9d0dcfe204b6bd30ba6d4e (diff) | |
| parent | 4a00e76e7a5ce62d36d8690eafc5854620453c3c (diff) | |
| download | mariadb-git-938ba3e11e5572437229427e9568660246b12de3.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.1.clean
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/records.cc b/sql/records.cc index b2505600b22..f8b6a7d1df9 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -20,7 +20,7 @@ #include "mysql_priv.h" static int rr_quick(READ_RECORD *info); -static int rr_sequential(READ_RECORD *info); +int rr_sequential(READ_RECORD *info); static int rr_from_tempfile(READ_RECORD *info); static int rr_unpack_from_tempfile(READ_RECORD *info); static int rr_unpack_from_buffer(READ_RECORD *info); @@ -251,6 +251,7 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, } /* init_read_record */ + void end_read_record(READ_RECORD *info) { /* free cache if used */ if (info->cache) @@ -260,7 +261,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(); @@ -356,7 +357,7 @@ static int rr_index(READ_RECORD *info) } -static int rr_sequential(READ_RECORD *info) +int rr_sequential(READ_RECORD *info) { int tmp; while ((tmp=info->file->rnd_next(info->record))) |