diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-09 12:27:51 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-09 12:27:51 -0400 |
| commit | a16a72b6c3c46538a6b79c6500b1a79756866450 (patch) | |
| tree | 46137c7289c73db76ff56b401daabb233cdea751 /sql/unireg.h | |
| parent | f89f3c803df72c25124344a56949ec573363a2e8 (diff) | |
| parent | 2bc7179d2d0019fd2b4666de0990faf3f19b9582 (diff) | |
| download | mariadb-git-a16a72b6c3c46538a6b79c6500b1a79756866450.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
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 b605f7d04e7..1326b22c8c9 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -60,7 +60,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 */ |