diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
commit | 45898c20928ae71f2c28dca48e66c661b9545347 (patch) | |
tree | 4b12470d4ee5dc1845d6e5680f5a67ac210195a6 /sql/opt_sum.cc | |
parent | 0e3ca225ad65f14da79c9a73aeadcc2a3e1c0c2a (diff) | |
parent | 648d86615043e76633ac536b1000ba86abbc8af1 (diff) | |
download | mariadb-git-45898c20928ae71f2c28dca48e66c661b9545347.tar.gz |
Merge remote-tracking branch 'origin/10.0' into 10.0
Diffstat (limited to 'sql/opt_sum.cc')
-rw-r--r-- | sql/opt_sum.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 5a5e17dda6d..9712b3c3d42 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2008-2011 Monty Program Ab + Copyright (c) 2008, 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1050,6 +1050,7 @@ static int maxmin_in_range(bool max_fl, Field* field, COND *cond) case Item_func::LT_FUNC: case Item_func::LE_FUNC: less_fl= 1; + /* fall through */ case Item_func::GT_FUNC: case Item_func::GE_FUNC: { |