diff options
| author | unknown <monty@mysql.com> | 2004-03-12 01:13:04 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 01:13:04 +0200 |
| commit | 965158f28fa9527c62b3c316c458a8753a5da4e4 (patch) | |
| tree | 5e4aed5605eda5dab05891e904dddd1af46c1f54 /sql/item_func.cc | |
| parent | bebe22a99e0b48b09c4ac69561ede17ff1766b1a (diff) | |
| parent | dd8b25510e11ca35c37bb9949810ac84c6d7ce29 (diff) | |
| download | mariadb-git-965158f28fa9527c62b3c316c458a8753a5da4e4.tar.gz | |
Merge
mysql-test/install_test_db.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/mysql-test-run.sh:
SCCS 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 ab96915e746..9d1f784fc25 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); } |