diff options
| author | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-02-06 15:23:41 +0300 |
| commit | 5db2d195a653d913b4b0adf741df79151ca2a5a6 (patch) | |
| tree | 7230fe81c62fa6a2bc488216ab3775d11795f3a5 /sql/item_func.cc | |
| parent | 15b89bfc5981ad348220fbf3f7067b7465d71080 (diff) | |
| parent | b5819094a70fa1c4f9c231424af6792da0b7b801 (diff) | |
| download | mariadb-git-5db2d195a653d913b4b0adf741df79151ca2a5a6.tar.gz | |
merge 3.23 -> 4.0, 2003/02/06
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 64b1c5d4d8a..656dff63609 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -551,7 +551,8 @@ double Item_func_pow::val() double Item_func_acos::val() { - double value=args[0]->val(); + // the volatile's for BUG #2338 to calm optimizer down (because of gcc's bug) + volatile double value=args[0]->val(); if ((null_value=(args[0]->null_value || (value < -1.0 || value > 1.0)))) return 0.0; return fix_result(acos(value)); @@ -559,7 +560,8 @@ double Item_func_acos::val() double Item_func_asin::val() { - double value=args[0]->val(); + // the volatile's for BUG #2338 to calm optimizer down (because of gcc's bug) + volatile double value=args[0]->val(); if ((null_value=(args[0]->null_value || (value < -1.0 || value > 1.0)))) return 0.0; return fix_result(asin(value)); |