diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
| commit | 69204571425ed3221e94c7eb1e030c00089bca26 (patch) | |
| tree | 3d9cfbc44a057883c7db6bce267c8ebfd5fa9313 /sql/item_subselect.h | |
| parent | e3e60a4102d6918e4231e402bef89b1a6b2a20cb (diff) | |
| parent | d26aefb0775048128495eaab151ee4118f8f7afd (diff) | |
| download | mariadb-git-69204571425ed3221e94c7eb1e030c00089bca26.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 16b901e1333..9842641788b 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* + Copyright (c) 2002, 2010, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +12,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ /* subselect Item */ @@ -431,9 +433,10 @@ protected: class subselect_single_select_engine: public subselect_engine { - bool prepared; /* simple subselect is prepared */ - bool optimized; /* simple subselect is optimized */ - bool executed; /* simple subselect is executed */ + bool prepared; /* simple subselect is prepared */ + bool optimized; /* simple subselect is optimized */ + bool executed; /* simple subselect is executed */ + bool optimize_error; /* simple subselect optimization failed */ st_select_lex *select_lex; /* corresponding select_lex */ JOIN * join; /* corresponding JOIN structure */ public: |