summaryrefslogtreecommitdiff
path: root/sql/opt_table_elimination.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-08-25 12:27:50 +0300
committerSergey Petrunya <psergey@askmonty.org>2009-08-25 12:27:50 +0300
commit5dcd894ba5c23dab063a6f18d1901923fa61c094 (patch)
treec21a89566e435949732ddf6a2b4b1043af6268db /sql/opt_table_elimination.cc
parent0913cda0c124f6d488656f086f5b72c63641745c (diff)
downloadmariadb-git-5dcd894ba5c23dab063a6f18d1901923fa61c094.tar.gz
MWL#17: Table elimination
- Add more testcases. - Fix trivial compile failure - Remove handling of "column IN (one_element)". This is converted to equality elsewhere mysql-test/r/table_elim.result: MWL#17: Table elimination - Add more testcases. - Fix trivial compile failure mysql-test/t/table_elim.test: MWL#17: Table elimination - Add more testcases sql/mysqld.cc: MWL#17: Table elimination - Fix trivial compile failure sql/opt_table_elimination.cc: MWL#17: Table elimination - Add more testcases. - Remove handling of "column IN (one_element)".This is converted to equality elsewhere
Diffstat (limited to 'sql/opt_table_elimination.cc')
-rw-r--r--sql/opt_table_elimination.cc13
1 files changed, 3 insertions, 10 deletions
diff --git a/sql/opt_table_elimination.cc b/sql/opt_table_elimination.cc
index 091538fd692..d59200806a8 100644
--- a/sql/opt_table_elimination.cc
+++ b/sql/opt_table_elimination.cc
@@ -467,15 +467,6 @@ void build_eq_mods_for_cond(Func_dep_analyzer *fda, Equality_module **eq_mod,
Item **args= cond_func->arguments();
switch (cond_func->functype()) {
- case Item_func::IN_FUNC:
- {
- if (cond_func->argument_count() == 2)
- {
- add_eq_mod(fda, eq_mod, *and_level, cond_func, args[0], args[1]);
- add_eq_mod(fda, eq_mod, *and_level, cond_func, args[1], args[0]);
- }
- break;
- }
case Item_func::BETWEEN:
{
Item *fld;
@@ -837,7 +828,7 @@ static Table_value *get_table_value(Func_dep_analyzer *fda, TABLE *table)
{
Table_value *tbl_dep;
if (!(tbl_dep= new Table_value(table)))
- return NULL;
+ return NULL; /* purecov: inspected */
Key_module **key_list= &(tbl_dep->keys);
/* Add dependencies for unique keys */
@@ -1499,6 +1490,7 @@ static void mark_as_eliminated(JOIN *join, TABLE_LIST *tbl)
#ifndef DBUG_OFF
+/* purecov: begin inspected */
static
void dbug_print_deps(Func_dep_analyzer *fda)
{
@@ -1559,6 +1551,7 @@ void dbug_print_deps(Func_dep_analyzer *fda)
DBUG_UNLOCK_FILE;
DBUG_VOID_RETURN;
}
+/* purecov: end */
#endif
/**