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 /mysql-test/r/func_math.result | |
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 'mysql-test/r/func_math.result')
-rw-r--r-- | mysql-test/r/func_math.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index d6596e51db4..e37862d0176 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -41,3 +41,15 @@ pi() sin(pi()/2) cos(pi()/2) abs(tan(pi())) cot(1) asin(1) acos(0) atan(1) select degrees(pi()),radians(360); degrees(pi()) radians(360) 180 6.2831853071796 +ACOS(1.0) +0.000000 +ASIN(1.0) +1.570796 +ACOS(0.2*5.0) +0.000000 +ACOS(0.5*2.0) +0.000000 +ASIN(0.8+0.2) +1.570796 +ASIN(1.2-0.2) +1.570796 |