diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-02 18:19:52 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-02 18:19:52 +0300 |
| commit | c287af80c4c26748ce6038319d5f5b4b6d62b289 (patch) | |
| tree | 0dd4ff4c1897394e1bea44c869ce1e39e46a6afd /mysql-test | |
| parent | faa171a9f072e3049d31b07db3a34604847bbdb2 (diff) | |
| download | mariadb-git-c287af80c4c26748ce6038319d5f5b4b6d62b289.tar.gz | |
Fixed test results after last changes
mysql-test/r/func_if.result:
Fixed results after last changes
mysql-test/r/func_test.result:
Fixed results after last changes
mysql-test/r/type_float.result:
Fixed results after last changes
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_if.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_test.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/type_float.result | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result index 64ee8c67def..85c4007f63c 100644 --- a/mysql-test/r/func_if.result +++ b/mysql-test/r/func_if.result @@ -32,4 +32,4 @@ a aa aaa sum(if(num is null,0.00,num)) -nan +144.54 diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result index 5d2211baf50..586e345ea10 100644 --- a/mysql-test/r/func_test.result +++ b/mysql-test/r/func_test.result @@ -18,8 +18,6 @@ 1 !0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 or 1=1 and 1=0 1 1 0 1 0 1 1 1 -IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0 -this is a 2 2.0 2 between 1 and 3 "monty" between "max" and "my" 2=2 and "monty" between "max" and "my" and 3=3 1 1 1 'b' between 'a' and 'c' 'B' between 'a' and 'c' @@ -34,5 +32,3 @@ this is a 2 2.0 1 1 1 and 0 or 2 2 or 1 and 0 1 1 -sum(if(num is null,0.00,num)) -144.54 diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result index 30a2f884557..d8fbc5bc725 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/type_float.result @@ -57,7 +57,7 @@ de2 decimal(6,0) YES NULL select,insert,update,references de3 decimal(5,2) YES NULL select,insert,update,references n decimal(10,0) YES NULL select,insert,update,references n2 decimal(8,0) YES NULL select,insert,update,references -n3 decimal(8,6) YES NULL select,insert,update,references +n3 decimal(7,6) YES NULL select,insert,update,references a -0.010 -0.002 |