diff options
| author | konstantin@mysql.com <> | 2004-02-06 15:23:41 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-02-06 15:23:41 +0300 |
| commit | 2a4cfe8b4f09b97133893fa5423c4cf2ce589ade (patch) | |
| tree | 7230fe81c62fa6a2bc488216ab3775d11795f3a5 /sql/item_func.cc | |
| parent | 650580698f7f473b1ccb5a520a17fc8b269c7c9f (diff) | |
| parent | 2093624a732c5bec57db3460d2297356e07c4946 (diff) | |
| download | mariadb-git-2a4cfe8b4f09b97133893fa5423c4cf2ce589ade.tar.gz | |
merge 3.23 -> 4.0, 2003/02/06
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)); |