diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-12-11 15:43:41 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-12-11 15:43:41 +0300 |
| commit | 79dd77e6aebc861b82e4895941224bbbad441650 (patch) | |
| tree | 8c22b54de7964a89358415b5380c2bc734f162a1 /sql/sql_union.cc | |
| parent | b7cd18289639b30fafc7f623c1187e442608727c (diff) | |
| parent | 8f581e8bf1d400be08995b1cf8c11e3b0f7ae283 (diff) | |
| download | mariadb-git-79dd77e6aebc861b82e4895941224bbbad441650.tar.gz | |
System Versioning 1.0 pre3
Merge branch '10.3' into trunk
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index ecc2a54bdd8..b3a7227678d 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -303,7 +303,8 @@ int select_union_recursive::send_data(List<Item> &values) { int rc= select_unit::send_data(values); - if (write_err != HA_ERR_FOUND_DUPP_KEY && + if (rc == 0 && + write_err != HA_ERR_FOUND_DUPP_KEY && write_err != HA_ERR_FOUND_DUPP_UNIQUE) { int err; @@ -1360,6 +1361,9 @@ bool st_select_lex_unit::exec() if (saved_error) DBUG_RETURN(saved_error); + if (union_result) + union_result->init(); + if (uncacheable || !item || !item->assigned() || describe) { if (!fake_select_lex && !(with_element && with_element->is_recursive)) |