diff options
| author | unknown <monty@mysql.com> | 2004-05-05 21:24:45 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-05 21:24:45 +0300 |
| commit | e5d43578fdcd87e1f774782ceed811b6f2b0a044 (patch) | |
| tree | 3af8fd1bdc7cb6e35635b31747103660afaae663 /sql/sql_union.cc | |
| parent | b30d0883b1e87df5a476a9e48542321de4384aa4 (diff) | |
| parent | 000f76cfb844eeda1c1c0092d4ab97f3f3acb6cb (diff) | |
| download | mariadb-git-e5d43578fdcd87e1f774782ceed811b6f2b0a044.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_union.cc:
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 0dcf9f4731b..82486333ac9 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; @@ -404,7 +402,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, |