diff options
| author | unknown <monty@mysql.com> | 2004-05-05 21:24:21 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-05 21:24:21 +0300 |
| commit | a18b96b1a4f599eaa28fbcc4162d08c1c05cac3d (patch) | |
| tree | 7237dcd91649e057a85eb3caca141f3df5892db8 /sql/sql_union.cc | |
| parent | 3b887983bfc19585825ec528a80118f2c93f2b04 (diff) | |
| download | mariadb-git-a18b96b1a4f599eaa28fbcc4162d08c1c05cac3d.tar.gz | |
after merge fixes
client/mysqldump.c:
Fixed problem with multiple tables (--skip-quote didn't work properly for second table)
myisam/myisamchk.c:
after merge fix
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 1b3995f30be..cffbece2f18 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -367,8 +367,6 @@ int st_select_lex_unit::exec() optimized= 1; /* Send result to 'result' */ - - res= -1; { List<Item_func_match> empty_list; @@ -405,7 +403,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, |