diff options
| author | pem@mysql.com <> | 2003-12-19 18:03:27 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-19 18:03:27 +0100 |
| commit | 99e0ae85c7bb983202e70e5f67d4b4d383b44a80 (patch) | |
| tree | 00894c28662192eed25fdacc555298265a2880ac /sql/records.cc | |
| parent | 7fdf6740c74cf153dd10a62876119e9ac11fbc41 (diff) | |
| parent | c49773237d2bb807e10ffb66c321f87a20f1e1c6 (diff) | |
| download | mariadb-git-99e0ae85c7bb983202e70e5f67d4b4d383b44a80.tar.gz | |
Merge 4.1 to 5.0.
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/records.cc b/sql/records.cc index b29b113a1bc..cd1de5af6aa 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -118,11 +118,12 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, info->read_record=rr_sequential; table->file->rnd_init(); /* We can use record cache if we don't update dynamic length tables */ - if (use_record_cache > 0 || - (int) table->reginfo.lock_type <= (int) TL_READ_HIGH_PRIORITY || - !(table->db_options_in_use & HA_OPTION_PACK_RECORD) || - (use_record_cache < 0 && - !(table->file->table_flags() & HA_NOT_DELETE_WITH_CACHE))) + if (!table->no_cache && + (use_record_cache > 0 || + (int) table->reginfo.lock_type <= (int) TL_READ_HIGH_PRIORITY || + !(table->db_options_in_use & HA_OPTION_PACK_RECORD) || + (use_record_cache < 0 && + !(table->file->table_flags() & HA_NOT_DELETE_WITH_CACHE)))) VOID(table->file->extra_opt(HA_EXTRA_CACHE, thd->variables.read_buff_size)); } |