diff options
author | Michael Widenius <monty@askmonty.org> | 2013-06-05 23:53:35 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-06-05 23:53:35 +0300 |
commit | bef95a4bbea0a3a42ad26798d3c3aa326dc282bf (patch) | |
tree | 9adc5ff47acfe5633c05ebcb4c3cd26d13d5878e /sql/multi_range_read.cc | |
parent | 33ef993773449cb3917665b188f6b6575d399bd0 (diff) | |
download | mariadb-git-bef95a4bbea0a3a42ad26798d3c3aa326dc282bf.tar.gz |
-Run test suite with smaller aria keybuffer size (to make it possible to run more tests in parallel)
-Added test and extra code to ensure we don't leave keyread on for a handler table.
-Create on disk temporary files always with long data pointers if SQL_SMALL_RESULT is not used. This ensures that we can handle temporary files bigger than 4G.
mysql-test/include/default_mysqld.cnf:
Run test suite with smaller aria keybuffer size
mysql-test/suite/maria/maria3.result:
Run test suite with smaller aria keybuffer size
mysql-test/suite/sys_vars/r/aria_pagecache_buffer_size_basic.result:
Run test suite with smaller aria keybuffer size
sql/handler.cc:
Disable key read (extra safety if something went wrong)
sql/multi_range_read.cc:
Ensure we have don't leave keyread on for secondary_file
sql/opt_range.cc:
Simplify code with mark_columns_used_by_index_no_reset()
Ensure that read_keys_and_merge() disableds keyread if it enables it
sql/opt_subselect.cc:
Remove not anymore used argument for create_internal_tmp_table()
sql/sql_derived.cc:
Remove not anymore used argument for create_internal_tmp_table()
sql/sql_select.cc:
Use 'enable_keyread()' instead of calling HA_EXTRA_RESET. (Makes debugging easier)
Create on disk temporary files always with long data pointers if SQL_SMALL_RESULT is not used. This ensures that we can handle temporary files bigger than 4G.
Remove not anymore used argument for create_internal_tmp_table()
More DBUG
sql/sql_select.h:
Remove not anymore used argument for create_internal_tmp_table()
Diffstat (limited to 'sql/multi_range_read.cc')
-rw-r--r-- | sql/multi_range_read.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index 175405790b5..1f624f4bc63 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -1114,6 +1114,7 @@ void DsMrr_impl::close_second_handler() { if (secondary_file) { + secondary_file->extra(HA_EXTRA_NO_KEYREAD); secondary_file->ha_index_or_rnd_end(); secondary_file->ha_external_lock(current_thd, F_UNLCK); secondary_file->ha_close(); |