Commit 1f01817e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-6080 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
parents 279846b4 c62a5942

mysql-test/r/errors.result

+5 −0
Original line number Diff line number Diff line
@@ -23,3 +23,8 @@ ERROR 42S22: Unknown column 't1.b' in 'order clause' 
select count(*),b from t1;

ERROR 42S22: Unknown column 'b' in 'field list'

drop table t1;

create table t1 (a int(256));

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

mysql-test/r/type_bit.result

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ select 0 + b'1000000000000001'; 
32769

drop table if exists t1;

create table t1 (a bit(65));

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

ERROR 42000: Display width out of range for column 'a' (max = 64)

create table t1 (a bit(0));

show create table t1;

Table	Create Table

mysql-test/r/type_bit_innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ select 0 + b'1000000000000001'; 
32769

drop table if exists t1;

create table t1 (a bit(65)) engine=innodb;

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

ERROR 42000: Display width out of range for column 'a' (max = 64)

create table t1 (a bit(0)) engine=innodb;

show create table t1;

Table	Create Table

mysql-test/t/errors.test

+11 −0
Original line number Diff line number Diff line
@@ -31,3 +31,14 @@ select count(*),b from t1; 
drop table t1;



# End of 4.1 tests



#

# Bug #6080: Error message for a field with a display width that is too long

#

--error 1438

create table t1 (a int(256));

set sql_mode='traditional';

--error 1074

create table t1 (a varchar(66000));



# End of 5.0 tests

mysql-test/t/type_bit_innodb.test

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ select 0 + b'1000000000000001'; 
drop table if exists t1;

--enable_warnings



--error 1074

--error 1438

create table t1 (a bit(65)) engine=innodb;



create table t1 (a bit(0)) engine=innodb;