diff options
author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-10-05 13:55:51 +0400 |
---|---|---|
committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-10-05 13:55:51 +0400 |
commit | 7141bada7d73df8015c84c2e6b558a20f589f8d6 (patch) | |
tree | 699427bad482b67b8aedcdc1ad28bdfd6c76ec3e /sql/item_subselect.h | |
parent | 14572938232ffcd0c34a64303a6fd5d5ede1f8a9 (diff) | |
parent | 14dc91ff83001809fc40380ab22fc4e606f611de (diff) | |
download | mariadb-git-7141bada7d73df8015c84c2e6b558a20f589f8d6.tar.gz |
5.1 -> 5.5 merge
Diffstat (limited to 'sql/item_subselect.h')
-rw-r--r-- | sql/item_subselect.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 562eaa8a8ee..51de9bf1040 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -429,6 +429,7 @@ class subselect_single_select_engine: public subselect_engine my_bool prepared; /* simple subselect is prepared */ my_bool optimized; /* simple subselect is optimized */ my_bool executed; /* simple subselect is executed */ + my_bool optimize_error; ///< simple subselect optimization failed st_select_lex *select_lex; /* corresponding select_lex */ JOIN * join; /* corresponding JOIN structure */ public: |