diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-29 13:10:29 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-29 13:10:29 +0200 |
| commit | fceda2dab6f8ea6c042f910cbc1d07d5df0cbc3c (patch) | |
| tree | ea236e66130aad86ad9e87b83a261291a8119fad /sql/item.cc | |
| parent | bd0b368119b48ffbb1e5ab3cd2887270c5c6840e (diff) | |
| parent | e48d775c6f066add457fa8cfb2ebc4d5ff0c7613 (diff) | |
| download | mariadb-git-fceda2dab6f8ea6c042f910cbc1d07d5df0cbc3c.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
We do not accept:
1. We did not have this problem (fixed earlier and better)
d982e717aba67227ec40761a21a4211db91aa0e2 Bug#27510150: MYSQLDUMP FAILS FOR SPECIFIC --WHERE CLAUSES
2. We do not have such options (an DBUG_ASSERT put just in case)
bbc2e37fe4e0ca3a7cfa1437a763dc43829e98e2 Bug#27759871: BACKRONYM ISSUE IS STILL IN MYSQL 5.7
3. Serg fixed it in other way in this release:
e48d775c6f066add457fa8cfb2ebc4d5ff0c7613 Bug#27980823: HEAP OVERFLOW VULNERABILITIES IN MYSQL CLIENT LIBRARY
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 135255ee21e..33c35f8c3e0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2000, 2018, Oracle and/or its affiliates. Copyright (c) 2010, 2018, MariaDB Corporation This program is free software; you can redistribute it and/or modify @@ -9655,6 +9655,7 @@ bool Item_type_holder::join_types(THD *thd, Item *item) if (Field::result_merge_type(fld_type) == DECIMAL_RESULT) { + collation.set_numeric(); decimals= min(max(decimals, item->decimals), DECIMAL_MAX_SCALE); int item_int_part= item->decimal_int_part(); int item_prec = max(prev_decimal_int_part, item_int_part) + decimals; |