diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-15 16:41:10 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-15 16:41:10 +0200 |
| commit | 39f236a2f532fc3364c5594739ef74489fb24478 (patch) | |
| tree | fee7537c649aa02213d98c81381c50133bec439f /sql/item_sum.cc | |
| parent | 68e5d6a9416b2923e78123cbc67e1755b8a21806 (diff) | |
| parent | 9c6fc7b644da912a0e68c720f2234a8554bbfeb9 (diff) | |
| download | mariadb-git-39f236a2f532fc3364c5594739ef74489fb24478.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 23e63f709cd..234e9dad0b3 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2211,7 +2211,7 @@ bool Item_sum_bit::remove_as_window(ulonglong value) } // Prevent overflow; - num_values_added = std::min(num_values_added, num_values_added - 1); + num_values_added = MY_MIN(num_values_added, num_values_added - 1); set_bits_from_counters(); return 0; } @@ -2224,7 +2224,7 @@ bool Item_sum_bit::add_as_window(ulonglong value) bit_counters[i]+= (value & (1ULL << i)) ? 1 : 0; } // Prevent overflow; - num_values_added = std::max(num_values_added, num_values_added + 1); + num_values_added = MY_MAX(num_values_added, num_values_added + 1); set_bits_from_counters(); return 0; } |