diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-12 17:48:58 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-12 17:48:58 +0300 |
| commit | d7149a5ba629a1c7e88b133f0200d25c4e26e779 (patch) | |
| tree | 2dce6fa4d69823aaab47301400342fbff7c8e79d /sql/sql_union.cc | |
| parent | 27c522127f57759cf6f41148513dcd73bccb1496 (diff) | |
| parent | abbcc4ffbba233a9a7eeeb037655de2bd92e7914 (diff) | |
| download | mariadb-git-d7149a5ba629a1c7e88b133f0200d25c4e26e779.tar.gz | |
merge
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 0d50348f199..0b5216d623e 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -368,7 +368,8 @@ int st_select_lex_unit::exec() global_parameters->order_list.elements, (ORDER*)global_parameters->order_list.first, (ORDER*) NULL, NULL, (ORDER*) NULL, - thd->options, result, this, fake_select_lex, 0); + thd->options | SELECT_NO_UNLOCK, + result, this, fake_select_lex, 0); if (found_rows_for_union && !res) thd->limit_found_rows = (ulonglong)table->file->records; /* |