diff options
| author | monty@mysql.com <> | 2005-04-07 19:24:14 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-04-07 19:24:14 +0300 |
| commit | 780202f130f97a358d4cbce3388e840664daf176 (patch) | |
| tree | a13c6e5a064f49577a196e35cf5333975a36f347 /sql/records.cc | |
| parent | b950bc210c64440c9bc12c9d8d77c9cf4a0b5ac4 (diff) | |
| download | mariadb-git-780202f130f97a358d4cbce3388e840664daf176.tar.gz | |
Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/records.cc b/sql/records.cc index b71bcf70865..9b05dc3e291 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -89,7 +89,8 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, (ulonglong) MIN_FILE_LENGTH_TO_USE_ROW_CACHE && info->io_cache->end_of_file/info->ref_length * table->s->reclength > (my_off_t) MIN_ROWS_TO_USE_TABLE_CACHE && - !table->s->blob_fields) + !table->s->blob_fields && + info->ref_length <= MAX_REFLENGTH) { if (! init_rr_cache(thd, info)) { @@ -348,7 +349,8 @@ static int init_rr_cache(THD *thd, READ_RECORD *info) MYF(0)))) DBUG_RETURN(1); #ifdef HAVE_purify - bzero(info->cache,rec_cache_size); // Avoid warnings in qsort + // Avoid warnings in qsort + bzero(info->cache,rec_cache_size+info->cache_records* info->struct_length+1); #endif DBUG_PRINT("info",("Allocated buffert for %d records",info->cache_records)); info->read_positions=info->cache+rec_cache_size; |