diff options
| author | unknown <timour@askmonty.org> | 2012-09-18 13:42:06 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-09-18 13:42:06 +0300 |
| commit | caf31114c806ea7343cba7b299a0f395fa603545 (patch) | |
| tree | 03d5ef42e317bbd113f53503686d889a543ece76 /sql/item_subselect.h | |
| parent | 0704d47007c394d07226cf1fec984fda27d9b3cf (diff) | |
| parent | 0bc89929ef5ac431e5a8b64d30e1f5cdb25aedcc (diff) | |
| download | mariadb-git-caf31114c806ea7343cba7b299a0f395fa603545.tar.gz | |
Merged the fix for bug lp:1009187, mdev-373
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 05c4528490f..2a64c63a1be 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -591,6 +591,7 @@ public: /* Inform 'this' that it was computed, and contains a valid result. */ void set_first_execution() { if (first_execution) first_execution= FALSE; } bool expr_cache_is_needed(THD *thd); + inline bool left_expr_has_null(); int optimize(double *out_rows, double *cost); /* @@ -869,7 +870,6 @@ protected: expression is NULL. */ bool empty_result_set; - bool null_keypart; /* TRUE <=> constructed search tuple has a NULL */ public: // constructor can assign THD because it will be called after JOIN::prepare @@ -893,8 +893,7 @@ public: bool no_tables(); int index_lookup(); /* TIMOUR: this method needs refactoring. */ int scan_table(); - bool copy_ref_key(); - int copy_ref_key_simple(); /* TIMOUR: this method needs refactoring. */ + bool copy_ref_key(bool skip_constants); bool no_rows() { return empty_result_set; } virtual enum_engine_type engine_type() { return UNIQUESUBQUERY_ENGINE; } }; |