diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-06-04 17:26:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-04 17:26:11 +0200 |
| commit | 3e3606d21deec2a7508d47740ab7a7a7f5b9b698 (patch) | |
| tree | 5e041eb2fc7ca4f15ff97bfc3dba62840ab802fc /sql/item_subselect.h | |
| parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
| parent | 25ada13db06d06050f0361bc434fe2b58303b5f2 (diff) | |
| download | mariadb-git-3e3606d21deec2a7508d47740ab7a7a7f5b9b698.tar.gz | |
merge with 5.3.
Take only test cases from MDEV-136 Non-blocking "set read_only"
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 1a4c8a25a01..0e0f61aedd9 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -279,7 +279,7 @@ public: subs_type substype() { return SINGLEROW_SUBS; } void reset(); - void no_rows_in_result() { reset(); make_const(); } + void no_rows_in_result(); bool select_transformer(JOIN *join); void store(uint i, Item* item); double val_real(); |