diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-02 20:46:03 +0300 |
| commit | 7cb2e2d1dce2c7466388f4a6ade0614564be82fc (patch) | |
| tree | 8de3d7e1875b8751450433ee53331ffb7322e7b5 /mysql-test | |
| parent | 0e5f0023b3405449c8e3371cb67989f1c1fbb3f7 (diff) | |
| parent | 32113efe2a7d32bfa5820cda37164436a53719cc (diff) | |
| download | mariadb-git-7cb2e2d1dce2c7466388f4a6ade0614564be82fc.tar.gz | |
merge with 3.23
BitKeeper/deleted/.del-rpl_empty_master_crash.result:
Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
Auto merged
include/my_net.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_math.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/func_math.test | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index fce98a58682..b961c839510 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -4,10 +4,8 @@ floor(5.5) floor(-5.5) select ceiling(5.5),ceiling(-5.5); ceiling(5.5) ceiling(-5.5) 6 -5 -select truncate(52.64,1),truncate(52.64,2),truncate(52.64,-1),truncate(52.64,-2); -truncate(52.64,1) truncate(52.64,2) truncate(52.64,-1) truncate(52.64,-2) -52.6 52.64 50 0 -select round(5.5),round(-5.5); +truncate(52.64,1) truncate(52.64,2) truncate(52.64,-1) truncate(52.64,-2) truncate(-52.64,1) truncate(-52.64,-1) +52.6 52.64 50 0 -52.6 -50 round(5.5) round(-5.5) 6 -6 select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2); diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test index ab7990eea79..5299897d0f0 100644 --- a/mysql-test/t/func_math.test +++ b/mysql-test/t/func_math.test @@ -4,7 +4,7 @@ select floor(5.5),floor(-5.5); select ceiling(5.5),ceiling(-5.5); -select truncate(52.64,1),truncate(52.64,2),truncate(52.64,-1),truncate(52.64,-2); +select truncate(52.64,1),truncate(52.64,2),truncate(52.64,-1),truncate(52.64,-2), truncate(-52.64,1),truncate(-52.64,-1); select round(5.5),round(-5.5); select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2); select abs(-10), sign(-5), sign(5), sign(0); |