diff options
| author | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
| commit | 3c82f72091d2c21519540ee5bcc3b2acadfbf198 (patch) | |
| tree | 8d29892167ff9d836d0992c219bf4307f1c03b75 /sql/sql_union.cc | |
| parent | 428830c50024475e85e12f6b188879c2de536529 (diff) | |
| parent | 306ebf7b1c1b26b45e93fbcbbf248b3479142c41 (diff) | |
| download | mariadb-git-3c82f72091d2c21519540ee5bcc3b2acadfbf198.tar.gz | |
manual merge
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
strings/ctype-utf8.c:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index c32c557a45e..c23f14e980b 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -656,14 +656,14 @@ bool st_select_lex::cleanup() if (join) { DBUG_ASSERT((st_select_lex*)join->select_lex == this); - error|= join->destroy(); + error= join->destroy(); delete join; join= 0; } for (SELECT_LEX_UNIT *lex_unit= first_inner_unit(); lex_unit ; lex_unit= lex_unit->next_unit()) { - error|= lex_unit->cleanup(); + error= (bool) ((uint) error | (uint) lex_unit->cleanup()); } DBUG_RETURN(error); } |