diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-29 16:13:18 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-29 16:13:18 +0200 |
| commit | 721e412854cc701b9a23c0a3ca2b84c936877bc2 (patch) | |
| tree | 2dd0026d401cb0c6b6a12e1c9f375f844e2e390f /sql/item_subselect.cc | |
| parent | 533497d8c901c5da6d51f3e83d1dcc74395a5b22 (diff) | |
| download | mariadb-git-721e412854cc701b9a23c0a3ca2b84c936877bc2.tar.gz | |
after merge fixes
Removed
mysql-test/t/disabled.def:
Disabled rp_ndb_dd_advance, becasue of random failures
mysql-test/t/rpl_ndb_dd_advance.test:
Added big_test, as this test takes +600 seconds
plugin/daemon_example/daemon_example.c:
Removed compiler warnings
sql/item_cmpfunc.cc:
after merge fixes
sql/item_subselect.cc:
after merge fixes
storage/ndb/src/common/util/ConfigValues.cpp:
Removed declarations to nonexisting functions
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Removed not used function
storage/ndb/src/kernel/blocks/lgman.cpp:
Removed not used variables
storage/ndb/src/kernel/blocks/pgman.cpp:
Removed not used variables
storage/ndb/src/kernel/blocks/restore.cpp:
Removed not used variables
storage/ndb/src/kernel/blocks/tsman.cpp:
Removed not used variables
storage/ndb/src/kernel/vm/DynArr256.cpp:
Removed not used variables
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
Removed not used variables
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Removed not used variables
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
Removed not used variable
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Removed not used variable
storage/ndb/tools/desc.cpp:
Removed not used variable
support-files/compiler_warnings.supp:
Added suppress message for hard to remove warning
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index fab0f203f96..5143cc8ed83 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1259,7 +1259,7 @@ Item_in_subselect::row_value_transformer(JOIN *join) (char *)"<list ref>") ); Item *col_item= new Item_cond_or(item_eq, item_isnull); - if (!abort_on_null && left_expr->el(i)->maybe_null) + if (!abort_on_null && left_expr->element_index(i)->maybe_null) { if (!(col_item= new Item_func_trig_cond(col_item, get_cond_guard(i)))) DBUG_RETURN(RES_ERROR); @@ -1273,7 +1273,7 @@ Item_in_subselect::row_value_transformer(JOIN *join) ref_pointer_array + i, (char *)"<no matter>", (char *)"<list ref>")); - if (!abort_on_null && left_expr->el(i)->maybe_null) + if (!abort_on_null && left_expr->element_index(i)->maybe_null) { if (!(item_nnull_test= new Item_func_trig_cond(item_nnull_test, get_cond_guard(i)))) @@ -1350,7 +1350,7 @@ Item_in_subselect::row_value_transformer(JOIN *join) TODO: why we create the above for cases where the right part cant be NULL? */ - if (left_expr->el(i)->maybe_null) + if (left_expr->element_index(i)->maybe_null) { if (!(item= new Item_func_trig_cond(item, get_cond_guard(i)))) DBUG_RETURN(RES_ERROR); @@ -1801,7 +1801,6 @@ int subselect_single_select_engine::exec() if (!executed) { item->reset_value_registration(); - bool have_changed_access= FALSE; JOIN_TAB *changed_tabs[MAX_TABLES]; JOIN_TAB **last_changed_tab= changed_tabs; if (item->have_guarded_conds()) |