Commit 51b60984 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 

into deer.(none):/home/hf/work/mysql-5.0.clean
parents 20d8170a 43fff9d5

mysql-test/r/innodb.result

+9 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/type_newdecimal.result

+0 −9
Original line number Diff line number Diff line
@@ -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

mysql-test/t/innodb.test

+12 −0
Original line number Diff line number Diff line
@@ -1381,3 +1381,15 @@ update t1 set a=2 where a=1; 
insert into t1 (val) values (1);

select * from t1;

drop table t1;

#

# Bug #10465

#



--disable_warnings

CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;

--enable_warnings

INSERT INTO t1 (GRADE) VALUES (151),(252),(343);

SELECT GRADE  FROM t1 WHERE GRADE > 160 AND GRADE < 300;

SELECT GRADE  FROM t1 WHERE GRADE= 151;

DROP TABLE t1;

mysql-test/t/type_newdecimal.test

+0 −12
Original line number Diff line number Diff line
@@ -907,18 +907,6 @@ INSERT INTO t1 VALUES (9999999999999999999999999999999999, 0); 
SELECT * FROM t1;

DROP TABLE t1;



#

# Bug #10465

#



--disable_warnings

CREATE TABLE t1 (GRADE DECIMAL(4) NOT NULL, PRIMARY KEY (GRADE)) ENGINE=INNODB;

--enable_warnings

INSERT INTO t1 (GRADE) VALUES (151),(252),(343);

SELECT GRADE  FROM t1 WHERE GRADE > 160 AND GRADE < 300;

SELECT GRADE  FROM t1 WHERE GRADE= 151;

DROP TABLE t1;



#

# Bug #10599: problem with NULL

#