diff options
| author | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2005-06-01 21:56:30 -0700 |
| commit | 113a99626d3debba5b5c7c574f20734ae8c025de (patch) | |
| tree | 21533890f530ab28e8f4542b5f7ca2deada7e9da /sql/item_subselect.cc | |
| parent | b884660a8366ce689efe3f6f135afb753a499fe7 (diff) | |
| parent | efb5ed5bab9699731c47894a6a1e805a303f6b37 (diff) | |
| download | mariadb-git-113a99626d3debba5b5c7c574f20734ae8c025de.tar.gz | |
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 4556f60a659..b7aefdd6f2e 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -22,6 +22,8 @@ SUBSELECT TODO: (sql_select.h/sql_select.cc) */ +#include <my_global.h> + #ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif @@ -384,9 +386,6 @@ Item_singlerow_subselect::select_transformer(JOIN *join) return RES_REDUCE; } return RES_OK; - -err: - return RES_ERROR; } |