Commit fe579334 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into neptunus.(none):/home/msvensson/mysql/bug9303
parents 8287938b e7db8779

mysql-test/r/type_blob.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ show columns from t1; 
Field	Type	Null	Key	Default	Extra

a	blob	YES		NULL	

b	text	YES		NULL	

c	blob	YES		NULL	

c	tinyblob	YES		NULL	

d	mediumtext	YES		NULL	

e	longtext	YES		NULL	

CREATE TABLE t2 (a char(257), b varbinary(70000), c varchar(70000000));

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -4404,7 +4404,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, 
      /* The user has given a length to the blob column */

      if (new_field->length < 256)

	type= FIELD_TYPE_TINY_BLOB;

      if (new_field->length < 65536)

      else if (new_field->length < 65536)

	type= FIELD_TYPE_BLOB;

      else if (new_field->length < 256L*256L*256L)

	type= FIELD_TYPE_MEDIUM_BLOB;