diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-09 18:09:42 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-09 18:09:42 -0400 |
| commit | 4a77e833f2c05938839d4f8ed8375420734428ad (patch) | |
| tree | 34a756c10c96bdedcfa8508577f50e141483d8bf /sql/unireg.h | |
| parent | c704e8bdd7d583e86efb7bae7f391a798c871ffa (diff) | |
| parent | 2bc7179d2d0019fd2b4666de0990faf3f19b9582 (diff) | |
| download | mariadb-git-4a77e833f2c05938839d4f8ed8375420734428ad.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/field.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 87e0e4ac8f8..aaf7a827f5f 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -63,7 +63,7 @@ #define MAX_MBWIDTH 3 /* Max multibyte sequence */ #define MAX_FIELD_CHARLENGTH 255 #define MAX_FIELD_VARCHARLENGTH 65535 -#define MAX_FIELD_BLOBLENGTH UINT_MAX +#define MAX_FIELD_BLOBLENGTH UINT_MAX32 /* cf field_blob::get_length() */ #define CONVERT_IF_BIGGER_TO_BLOB 512 /* Used for CREATE ... SELECT */ /* Max column width +1 */ |