bk commit into 4.1 tree (msvensson:1.2140) BUG#9303

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2140 05/03/24 13:48:38 msvensson@neptunus.(none) +2 -0
  BUG#9303 blob field with specified length < 256 does not create tinyblob

  sql/sql_parse.cc
    1.429 05/03/24 13:48:35 msvensson@neptunus.(none) +1 -1
    Added missing else so that FIELD_TINY_BLOB can be selected

  mysql-test/r/type_blob.result
    1.43 05/03/24 13:48:35 msvensson@neptunus.(none) +1 -1
    Test creates a blob(250 whcih is now displayed as tinyblob when SHOW COLUMNS is
called.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug9303

--- 1.428/sql/sql_parse.cc	2005-03-14 15:58:22 +01:00
+++ 1.429/sql/sql_parse.cc	2005-03-24 13:48:35 +01:00
@@ -4404,7 +4404,7 @@
       /* 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;

--- 1.42/mysql-test/r/type_blob.result	2005-03-04 11:20:16 +01:00
+++ 1.43/mysql-test/r/type_blob.result	2005-03-24 13:48:35 +01:00
@@ -4,7 +4,7 @@
 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));