summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_math.result
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-01 19:21:56 -0700
committerunknown <jimw@mysql.com>2005-08-01 19:21:56 -0700
commit421dd5f1c27109ca84dd1d1ce92c8d9559773e3b (patch)
tree940245c3dc8027eabe2f732e911372b489f9b031 /mysql-test/r/func_math.result
parentd083e4ac1b1450e99984dcf488cfd95cefaf78cb (diff)
downloadmariadb-git-421dd5f1c27109ca84dd1d1ce92c8d9559773e3b.tar.gz
Fix two test results that were merged out-of-order.
mysql-test/r/func_math.result: Fix incorrect merge of test results mysql-test/r/user_var.result: Fix incorrect merge
Diffstat (limited to 'mysql-test/r/func_math.result')
-rw-r--r--mysql-test/r/func_math.result10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index c84b26ce24e..0149911e36b 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -152,6 +152,16 @@ ceil(0.09)
select ceil(0.000000000000000009);
ceil(0.000000000000000009)
1
+create table t1 select round(1, 6);
+show create table t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `round(1, 6)` decimal(7,6) NOT NULL default '0.000000'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+select * from t1;
+round(1, 6)
+1.000000
+drop table t1;
select abs(-2) * -2;
abs(-2) * -2
-4