diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-08 11:40:43 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-08 11:40:43 +0200 |
| commit | 47396ddea91698f6ea1829697566a4d7c31bc789 (patch) | |
| tree | 552acc26b963574a234d2a3bc22b2190e5eabf0e /sql/item_subselect.h | |
| parent | c4f3e64c23fe7f7fd18c0a79f87f9771df15fe9f (diff) | |
| parent | 6860a4b55664d8fc53636906240c089417e1849d (diff) | |
| download | mariadb-git-47396ddea91698f6ea1829697566a4d7c31bc789.tar.gz | |
Merge 5.5 into 10.0
Also, implement MDEV-11027 a little differently from 5.5:
recv_sys_t::report(ib_time_t): Determine whether progress should
be reported.
recv_apply_hashed_log_recs(): Rename the parameter to last_batch.
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 0c62c3f8d02..f457eb92e3e 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -619,6 +619,15 @@ public: bool expr_cache_is_needed(THD *thd); inline bool left_expr_has_null(); + void disable_cond_guard_for_const_null_left_expr(int i) + { + if (left_expr->const_item() && !left_expr->is_expensive()) + { + if (left_expr->element_index(i)->is_null()) + set_cond_guard_var(i,FALSE); + } + } + int optimize(double *out_rows, double *cost); /* Return the identifier that we could use to identify the subquery for the |