summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2010-10-20 15:43:55 +0300
committerunknown <timour@askmonty.org>2010-10-20 15:43:55 +0300
commite85a4cb6b58b92f324f661d7bb78e6a5f90da883 (patch)
tree5e00d55b8f1d2ff203956ee163b40bbb0ef61ce0 /sql/sql_select.cc
parentaddd57828d5702349cf052e964c6bbc6e0371f9a (diff)
downloadmariadb-git-e85a4cb6b58b92f324f661d7bb78e6a5f90da883.tar.gz
MWL#89: Cost-based choice between Materialization and IN->EXISTS transformation
- Added more tests to the MWL#89 specific test, and made the test more modular. - Updated test files. - Fixed a memory leak. - More comments. mysql-test/r/subselect_mat.result: - Updated the test file to reflect the new optimizer switches related to materialized subquery execution. - Added one extra test to test all cases that expose BUG#40037 (this is an old bug from 5.x). - Updated the test result with correct results that expose BUG#40037. mysql-test/t/subselect_mat.test: - Updated the test file to reflect the new optimizer switches related to materialized subquery execution. - Added one extra test to test all cases that expose BUG#40037 (this is an old bug from 5.x). - Updated the test result with correct results that expose BUG#40037. sql/sql_select.cc: Fixed a memory leak reported by Valgrind.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index ee99f98c1ea..4e5dc9074f2 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -19372,12 +19372,6 @@ int JOIN::reoptimize(Item *added_where, table_map join_tables,
DYNAMIC_ARRAY added_keyuse;
SARGABLE_PARAM *sargables= 0; /* Used only as a dummy parameter. */
- if (my_init_dynamic_array(&added_keyuse, sizeof(KEYUSE), 20, 64))
- {
- delete_dynamic(&added_keyuse);
- return 1;
- }
-
/* Re-run the REF optimizer to take into account the new conditions. */
if (update_ref_and_keys(thd, &added_keyuse, join_tab, tables, added_where,
~outer_join, select_lex, &sargables))