summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorhf@deer.(none) <>2005-07-14 19:12:03 +0500
committerhf@deer.(none) <>2005-07-14 19:12:03 +0500
commit8f9a268a1c20f05cf6ec17f1a4f14d581a8bdbda (patch)
treef7695a6d24cad49422e85fd4b85d7494bd57f71c /mysql-test/r
parent6fd6fa517b9a660b8d0c81dcebcd880058f9561a (diff)
parent1969a1622ee1f2a16063d2b10121e89cb087db56 (diff)
downloadmariadb-git-8f9a268a1c20f05cf6ec17f1a4f14d581a8bdbda.tar.gz
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/innodb.result9
-rw-r--r--mysql-test/r/type_newdecimal.result9
2 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index aab4eb696d2..2c73cbeeea4 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -2466,3 +2466,12 @@ select * from t1;
a val
2 1
drop table t1;
+CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;
+INSERT INTO t1 (GRADE) VALUES (151),(252),(343);
+SELECT GRADE FROM t1 WHERE GRADE > 160 AND GRADE < 300;
+GRADE
+252
+SELECT GRADE FROM t1 WHERE GRADE= 151;
+GRADE
+151
+DROP TABLE t1;
diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result
index aed2a478c0e..c1039189a43 100644
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/r/type_newdecimal.result
@@ -876,15 +876,6 @@ SELECT * FROM t1;
f1 f2
9999999999999999999999999999999999.00000000000000000000 0.00
DROP TABLE t1;
-CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;
-INSERT INTO t1 (GRADE) VALUES (151),(252),(343);
-SELECT GRADE FROM t1 WHERE GRADE > 160 AND GRADE < 300;
-GRADE
-252
-SELECT GRADE FROM t1 WHERE GRADE= 151;
-GRADE
-151
-DROP TABLE t1;
select abs(10/0);
abs(10/0)
NULL