diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-25 16:46:45 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-25 16:46:45 +0300 |
| commit | 3c11750e363da6e1017d5bc86e9e7e03b2c4e101 (patch) | |
| tree | 3e8e0dbed8da743714f85fb19c404dce34319d8b /sql/records.cc | |
| parent | e2a34cbf706926e10016079a094a2877eb2f4f18 (diff) | |
| parent | be0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff) | |
| download | mariadb-git-3c11750e363da6e1017d5bc86e9e7e03b2c4e101.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/records.cc')
| -rw-r--r-- | sql/records.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/records.cc b/sql/records.cc index 8fd63d104a4..9ec19c55841 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -178,7 +178,7 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE && !table->sort.addon_field) - VOID(table->file->extra(HA_EXTRA_MMAP)); + (void) table->file->extra(HA_EXTRA_MMAP); if (table->sort.addon_field) { @@ -266,8 +266,8 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table, !(table->s->db_options_in_use & HA_OPTION_PACK_RECORD) || (use_record_cache < 0 && !(table->file->ha_table_flags() & HA_NOT_DELETE_WITH_CACHE)))) - VOID(table->file->extra_opt(HA_EXTRA_CACHE, - thd->variables.read_buff_size)); + (void) table->file->extra_opt(HA_EXTRA_CACHE, + thd->variables.read_buff_size); } /* Condition pushdown to storage engine */ if (thd->variables.engine_condition_pushdown && |