diff options
| author | cmiller@zippy.cornsilk.net <> | 2008-04-10 15:55:37 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2008-04-10 15:55:37 -0400 |
| commit | 82d8a99c057f51b72a1b0a0a386ef69209947b9c (patch) | |
| tree | 8dea0ffba4db761540a174d33919c136c7795d54 /sql/field.cc | |
| parent | 3c6591ad8f8cdc10d06b0ca8c1669d9fd14bd04b (diff) | |
| download | mariadb-git-82d8a99c057f51b72a1b0a0a386ef69209947b9c.tar.gz | |
Fix mismerge.
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 91f356988e4..18bb7153060 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8615,7 +8615,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); |