database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-29 21:42:28 +03:00
Code

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

Browse Source 
into neptunus.(none):/home/msvensson/mysql/bug9303
This commit is contained in:
unknown 2005-03-24 14:26:39 +01:00
commit fe5793342c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/type_blob.result
View File

@ -4,7 +4,7 @@ show columns from t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
a blob YES NULL a blob YES NULL
b text YES NULL b text YES NULL
c blob YES NULL c tinyblob YES NULL
d mediumtext YES NULL d mediumtext YES NULL
e longtext YES NULL e longtext YES NULL
CREATE TABLE t2 (a char(257), b varbinary(70000), c varchar(70000000)); CREATE TABLE t2 (a char(257), b varbinary(70000), c varchar(70000000));

2
sql/sql_parse.cc
View File

@ -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 */ /* The user has given a length to the blob column */
if (new_field->length < 256) if (new_field->length < 256)
type= FIELD_TYPE_TINY_BLOB; type= FIELD_TYPE_TINY_BLOB;
if (new_field->length < 65536) else if (new_field->length < 65536)
type= FIELD_TYPE_BLOB; type= FIELD_TYPE_BLOB;
else if (new_field->length < 256L*256L*256L) else if (new_field->length < 256L*256L*256L)
type= FIELD_TYPE_MEDIUM_BLOB; type= FIELD_TYPE_MEDIUM_BLOB;