diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-06-24 19:03:58 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-06-24 19:03:58 +0300 |
| commit | fe24f112389add94b8b1465791a22ff25479ad02 (patch) | |
| tree | 3b20a6237fd821492d6ca272f019f5dfce6fac15 /sql/sql_select.cc | |
| parent | 73d9c9b129475dec400092badb9c1adec892a4da (diff) | |
| parent | 2ef902a93067ec518338f23bb01871354890684c (diff) | |
| download | mariadb-git-fe24f112389add94b8b1465791a22ff25479ad02.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 151c25b0cca..487c5bfd99d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3884,7 +3884,8 @@ JOIN::join_free(bool full) */ if ((full || !select_lex->uncacheable) && lock && thd->lock && - !(select_options & SELECT_NO_UNLOCK)) + !(select_options & SELECT_NO_UNLOCK) && + !select_lex->subquery_in_having) { mysql_unlock_read_tables(thd, lock);// Don't free join->lock lock=0; |