diff options
| author | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
| commit | dd8b25510e11ca35c37bb9949810ac84c6d7ce29 (patch) | |
| tree | c0a17d040743869a3c5573eeaabb8a33a3224a2d /mysql-test/r/func_math.result | |
| parent | a1d9e1eec4ff8e9e53567bb3606bc4605a952375 (diff) | |
| parent | bc9de3d4552f2294bad973d0b9fbe07de3d07c1d (diff) | |
| download | mariadb-git-dd8b25510e11ca35c37bb9949810ac84c6d7ce29.tar.gz | |
Merge with 3.23 to get patch for floor()
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 46ad7a14e25..1b6a0d43738 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -59,3 +59,9 @@ ASIN(0.8+0.2) SELECT ASIN(1.2-0.2); 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 |