mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build

Browse source 
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
This commit is contained in:
unknown 2008-04-10 17:48:33 -04:00
commit e68f3e8d38
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/field.cc
View file

@ -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);