diff options
| author | monty@mysql.com <> | 2004-10-26 19:30:01 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-10-26 19:30:01 +0300 |
| commit | 6fbc869d183b777576670f37edaa293f16c1fa68 (patch) | |
| tree | 355a805ce6da2de5e852c4f9b8372d612070cd6d /sql/item_subselect.cc | |
| parent | 8b6839e6446fde2931583d4d8b74bb531add5062 (diff) | |
| download | mariadb-git-6fbc869d183b777576670f37edaa293f16c1fa68.tar.gz | |
A lot of fixes for prepared statements (PS):
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index dfcc5789ea4..a869e2d24fb 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -365,9 +365,9 @@ Item_singlerow_subselect::select_transformer(JOIN *join) if (!(substitution= new Item_func_if(cond, substitution, new Item_null()))) goto err; + if (arena->is_stmt_prepare()) + thd->restore_backup_item_arena(arena, &backup); } - if (arena->is_stmt_prepare()) - thd->restore_backup_item_arena(arena, &backup); return RES_REDUCE; } return RES_OK; |