diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-10 17:48:33 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-10 17:48:33 -0400 |
| commit | e68f3e8d38d6781ecc39627d80242ab0e855ecd2 (patch) | |
| tree | 18322cba03cd9ddf3eb5114f30198f92ba9a4508 /sql/field.cc | |
| parent | ec63ce25294e38a8ad581b72b1da83d48235d9e3 (diff) | |
| parent | 57784eae1235d62831cbdab16827027288dd7cbf (diff) | |
| download | mariadb-git-e68f3e8d38d6781ecc39627d80242ab0e855ecd2.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
mysql-test/t/type_blob.test:
Auto merged
sql/field.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/type_blob.result:
manual merge
sql/item_create.cc:
manual merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 7357389c794..3ecde13e78c 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9623,7 +9623,7 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, and 19 as length of 4.1 compatible representation. Silently shrink it to MAX_DATETIME_COMPRESSED_WIDTH. */ - DBUG_ASSERT(MAX_DATETIME_COMPRESSED_WIDTH < UINT_MAX); + DBUG_ASSERT(MAX_DATETIME_COMPRESSED_WIDTH < UINT_MAX); if (length != UINT_MAX) /* avoid overflow; is safe because of min() */ length= ((length+1)/2)*2; length= min(length, MAX_DATETIME_COMPRESSED_WIDTH); |