Commit d0b3cb68 authored by unknown's avatar unknown
Browse files

Manual merge 


mysql-test/r/type_blob.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Strange merge conflict
parents fa4a075b fe579334

sql/sql_parse.cc

+14 −0
Original line number Diff line number Diff line
@@ -5403,6 +5403,20 @@ new_create_field(THD *thd, char *field_name, enum_field_types type, 
  case FIELD_TYPE_LONG_BLOB:

  case FIELD_TYPE_MEDIUM_BLOB:

  case FIELD_TYPE_GEOMETRY:

    if (new_field->length)

    {

      /* The user has given a length to the blob column */

      if (new_field->length < 256)

	type= FIELD_TYPE_TINY_BLOB;

      else if (new_field->length < 65536)

	type= FIELD_TYPE_BLOB;

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

	type= FIELD_TYPE_MEDIUM_BLOB;

      else

	type= FIELD_TYPE_LONG_BLOB;

      new_field->length= 0;

    }

    new_field->sql_type= type;

    if (default_value)				// Allow empty as default value

    {

      String str,*res;