Commit baa9ff82 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build

parents 3828535b e68f3e8d
...@@ -9623,7 +9623,7 @@ bool Create_field::init(THD *thd, char *fld_name, enum_field_types fld_type, ...@@ -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 and 19 as length of 4.1 compatible representation. Silently
shrink it to MAX_DATETIME_COMPRESSED_WIDTH. 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() */ if (length != UINT_MAX) /* avoid overflow; is safe because of min() */
length= ((length+1)/2)*2; length= ((length+1)/2)*2;
length= min(length, MAX_DATETIME_COMPRESSED_WIDTH); length= min(length, MAX_DATETIME_COMPRESSED_WIDTH);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment