diff options
| author | unknown <sanja@askmonty.org> | 2010-09-06 15:34:24 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2010-09-06 15:34:24 +0300 |
| commit | d6a9b52269c2f64a8f793c4680eed9adece0a716 (patch) | |
| tree | a5f6b2b18651a0641556d5c1d6a0e7f3908e8f09 /sql/item_cmpfunc.h | |
| parent | 08d1de3732e50529318d533d5d83811b910ab9e9 (diff) | |
| download | mariadb-git-d6a9b52269c2f64a8f793c4680eed9adece0a716.tar.gz | |
Fixed LP BUG#615760: Check on double cache assignment added into the transformation methods.
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/compare.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/group_by.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect3.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect3_jcl6.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect4.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect_cache.result:
Added test suite for LP BUG#615760
mysql-test/r/subselect_mat.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect_no_mat.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect_no_opts.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect_no_semijoin.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect_sj.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/r/subselect_sj_jcl6.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/suite/pbxt/r/subselect.result:
Cache parameters print added in EXPLAIN EXTENDED output.
mysql-test/t/subselect_cache.test:
Cache parameters print added in EXPLAIN EXTENDED output.
sql/item.cc:
Item::set_expr_cache result fixed according to its description.
Cache parameters print added in EXPLAIN EXTENDED output.
sql/item.h:
Cache parameters print added in EXPLAIN EXTENDED output.
sql/item_cmpfunc.cc:
Check on double cache assignment added into the transformation methods.
sql/item_cmpfunc.h:
Check on double cache assignment added into the transformation methods.
sql/item_subselect.cc:
Check on double cache assignment added into the transformation methods.
sql/item_subselect.h:
Check on double cache assignment added into the transformation methods.
sql/sql_expression_cache.cc:
Cache parameters print added.
sql/sql_expression_cache.h:
Cache parameters print added.
sql/sql_select.cc:
Removed unused method (now it is impossible to make double transformation with the cache).
sql/sql_select.h:
Removed unused method.
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 053a54349c2..2eb419738e3 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -242,6 +242,7 @@ class Item_in_optimizer: public Item_bool_func { protected: Item_cache *cache; + Item *expr_cache; bool save_cache; /* Stores the value of "NULL IN (SELECT ...)" for uncorrelated subqueries: @@ -252,7 +253,7 @@ protected: my_bool result_for_null_param; public: Item_in_optimizer(Item *a, Item_in_subselect *b): - Item_bool_func(a, my_reinterpret_cast(Item *)(b)), cache(0), + Item_bool_func(a, my_reinterpret_cast(Item *)(b)), cache(0), expr_cache(0), save_cache(0), result_for_null_param(UNKNOWN) {} bool fix_fields(THD *, Item **); |