diff options
| author | monty@mysql.com <> | 2004-03-12 01:12:14 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-12 01:12:14 +0200 |
| commit | 98fb8ea4c742cb0a7f796ae6ec1d93bb449abdb1 (patch) | |
| tree | c0a17d040743869a3c5573eeaabb8a33a3224a2d /sql/item_func.cc | |
| parent | e27960a44e393ac67d037379f340db75a350495e (diff) | |
| parent | cba6ff7597ed1cde60e2c77e4814428b73d212bc (diff) | |
| download | mariadb-git-98fb8ea4c742cb0a7f796ae6ec1d93bb449abdb1.tar.gz | |
Merge with 3.23 to get patch for floor()
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); } |