diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-12-10 22:46:14 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-12-10 22:46:14 +0200 |
| commit | fc75518a78af9dfb68baac2cbf279983fe54b492 (patch) | |
| tree | ae06b7876934d32768f586a08de67e43088d1fad /sql/sql_lex.h | |
| parent | e0daf11201dd6e81af73c1c74270039e73845a24 (diff) | |
| download | mariadb-git-fc75518a78af9dfb68baac2cbf279983fe54b492.tar.gz | |
fixed unlocking tables during subquery execution (BUG#2048)
mysql-test/r/subselect_innodb.result:
bug 2048 test
mysql-test/t/subselect_innodb.test:
bug 2048 test
sql/item_subselect.cc:
do not unlock tables for subqueries
sql/sql_derived.cc:
derived table tables can be unlocked
sql/sql_lex.h:
new interface to pass additional options
sql/sql_union.cc:
new interface to pass additional options
do not unlock tables for UNION
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 15da6ca57a3..d8344403097 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -351,7 +351,7 @@ public: void exclude_tree(); /* UNION methods */ - int prepare(THD *thd, select_result *result); + int prepare(THD *thd, select_result *result, ulong additional_options); int exec(); int cleanup(); |