diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-09 17:31:22 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-09 17:31:22 +0400 |
| commit | 87f395d1d95ca0af097faabdcf1cd56b652c68dc (patch) | |
| tree | 6d2c894bd5c13b2a6b724e40d09510a34d932c65 /sql/sql_table.cc | |
| parent | 2894af4033a37c9582a1e321224122ced1fd8d1f (diff) | |
| parent | 4ce563e01cffebebd5c2a436ba67bf54e27f01f4 (diff) | |
| download | mariadb-git-87f395d1d95ca0af097faabdcf1cd56b652c68dc.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 16d420441d1..8ce4c0b0a46 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -3111,10 +3111,12 @@ static bool prepare_blob_field(THD *thd, Create_field *sql_field) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, ER_AUTO_CONVERT, warn_buff); } - + if ((sql_field->flags & BLOB_FLAG) && sql_field->length) { - if (sql_field->sql_type == MYSQL_TYPE_BLOB) + if (sql_field->sql_type == FIELD_TYPE_BLOB || + sql_field->sql_type == FIELD_TYPE_TINY_BLOB || + sql_field->sql_type == FIELD_TYPE_MEDIUM_BLOB) { /* The user has given a length to the blob column */ sql_field->sql_type= get_blob_type_from_length(sql_field->length); |