diff options
| author | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
| commit | dd8b25510e11ca35c37bb9949810ac84c6d7ce29 (patch) | |
| tree | c0a17d040743869a3c5573eeaabb8a33a3224a2d /sql/item_func.cc | |
| parent | a1d9e1eec4ff8e9e53567bb3606bc4605a952375 (diff) | |
| parent | bc9de3d4552f2294bad973d0b9fbe07de3d07c1d (diff) | |
| download | mariadb-git-dd8b25510e11ca35c37bb9949810ac84c6d7ce29.tar.gz | |
Merge with 3.23 to get patch for floor()
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 656dff63609..2d69e29991a 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -667,7 +667,8 @@ longlong Item_func_ceiling::val_int() longlong Item_func_floor::val_int() { - double value=args[0]->val(); + // the volatile's for BUG #3051 to calm optimizer down (because of gcc's bug) + volatile double value=args[0]->val(); null_value=args[0]->null_value; return (longlong) floor(value); } |