diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
commit | f00a314f9a659399eff392c4b635d1c381b9badb (patch) | |
tree | c64e89699dcc22b4ba3a62f83f21252c486617ce /sql/item_subselect.h | |
parent | e191833d758e89d282aea2d84126c9ca10036571 (diff) | |
parent | 2f3d4bd566b5e377fe8a1749c14050b0a0e083d0 (diff) | |
download | mariadb-git-f00a314f9a659399eff392c4b635d1c381b9badb.tar.gz |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
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 879859b4c34..22fc48391de 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -634,6 +634,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 |