diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-05 22:30:01 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-05 22:30:01 +0300 |
| commit | b52317df7105c7b556c030069ff27b134e9a8e26 (patch) | |
| tree | e967558b190a889ad77f62e0f69da4f76c0774f6 /sql/sql_union.cc | |
| parent | 2c95f97c2beea7b88378623d9655fcf2ad88a9a9 (diff) | |
| parent | 19d3f588f2165ed5025fe0b88c856474b913d6b8 (diff) | |
| download | mariadb-git-b52317df7105c7b556c030069ff27b134e9a8e26.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 84468313b4f..e5649192fe5 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -366,8 +366,6 @@ int st_select_lex_unit::exec() optimized= 1; /* Send result to 'result' */ - - res= -1; { List<Item_func_match> empty_list; @@ -395,7 +393,7 @@ int st_select_lex_unit::exec() if (!join) { /* - allocate JOIN for fake select only once (privent + allocate JOIN for fake select only once (prevent mysql_select automatic allocation) */ if (!(fake_select_lex->join= new JOIN(thd, item_list, thd->options, |