From bc9de3d4552f2294bad973d0b9fbe07de3d07c1d Mon Sep 17 00:00:00 2001
From: unknown <vva@eagle.mysql.r18.ru>
Date: Thu, 4 Mar 2004 22:11:33 +0400
Subject: [PATCH] fixed Bug #3051 "FLOOR returns invalid"
mysql-test/r/func_math.result:
added test for Bug #3051 "FLOOR returns invalid"
mysql-test/t/func_math.test:
added test for Bug #3051 "FLOOR returns invalid"
---
mysql-test/r/func_math.result | 6 ++++++
mysql-test/t/func_math.test | 8 ++++++++
sql/item_func.cc | 3 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index 5e774fe9886..e183b479a6c 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -32,3 +32,9 @@ ASIN(0.8+0.2)
1.570796
ASIN(1.2-0.2)
1.570796
+floor(log(4)/log(2))
+2
+floor(log(8)/log(2))
+3
+floor(log(16)/log(2))
+4
diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test
index 42ba8c73f69..c39c966547b 100644
--- a/mysql-test/t/func_math.test
+++ b/mysql-test/t/func_math.test
@@ -24,3 +24,11 @@ SELECT ACOS(0.2*5.0);
SELECT ACOS(0.5*2.0);
SELECT ASIN(0.8+0.2);
SELECT ASIN(1.2-0.2);
+
+#
+# Bug #3051 FLOOR returns invalid
+#
+
+select floor(log(4)/log(2));
+select floor(log(8)/log(2));
+select floor(log(16)/log(2));
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 037f7861630..dcd4e4a020c 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -572,7 +572,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);
}