diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-01-17 11:53:04 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-01-17 11:53:04 +0200 |
| commit | adca234881975e5b686275357980e34b2139b6de (patch) | |
| tree | dbb897b5d82c8b6b0db2fc4ab82f1544145159f7 /sql/item_subselect.cc | |
| parent | e0bd7faf5bc2845f49f60d067579a20092bf62b6 (diff) | |
| parent | fc75518a78af9dfb68baac2cbf279983fe54b492 (diff) | |
| download | mariadb-git-adca234881975e5b686275357980e34b2139b6de.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
mysql-test/r/subselect_innodb.result:
Auto merged
mysql-test/t/subselect_innodb.test:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 43775e1c96c..0380cd2c6cc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -906,7 +906,8 @@ int subselect_single_select_engine::prepare() { if (prepared) return 0; - join= new JOIN(thd, select_lex->item_list, select_lex->options, result); + join= new JOIN(thd, select_lex->item_list, + select_lex->options | SELECT_NO_UNLOCK, result); if (!join || !result) { thd->fatal_error(); //out of memory @@ -933,7 +934,7 @@ int subselect_single_select_engine::prepare() int subselect_union_engine::prepare() { - return unit->prepare(thd, result); + return unit->prepare(thd, result, SELECT_NO_UNLOCK); } int subselect_uniquesubquery_engine::prepare() |