Commit 89aa5548 authored by unknown's avatar unknown
Browse files

Merge magare.gmz:/home/kgeorge/mysql/work/B27513-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
parents 7603ed9f dbd125fd

mysql-test/r/errors.result

+1 −6
Original line number Diff line number Diff line
@@ -28,21 +28,16 @@ ERROR 42000: Display width out of range for column 'a' (max = 255) 
set sql_mode='traditional';

create table t1 (a varchar(66000));

ERROR 42000: Column length too big for column 'a' (max = 65535); use BLOB or TEXT instead

set sql_mode=default;

CREATE TABLE t1 (a INT);

SELECT a FROM t1 WHERE a IN(1, (SELECT IF(1=0,1,2/0)));

a

Warnings:

Error	1365	Division by 0

INSERT INTO t1 VALUES(1);

SELECT a FROM t1 WHERE a IN(1, (SELECT IF(1=0,1,2/0)));

a

1

Warnings:

Error	1365	Division by 0

INSERT INTO t1 VALUES(2),(3);

SELECT a FROM t1 WHERE a IN(1, (SELECT IF(1=0,1,2/0)));

a

1

Warnings:

Error	1365	Division by 0

DROP TABLE t1;

mysql-test/t/errors.test

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ create table t1 (a int(256)); 
set sql_mode='traditional';

--error 1074

create table t1 (a varchar(66000));

set sql_mode=default;



#

# Bug #27513: mysql 5.0.x + NULL pointer DoS