diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-02 10:56:49 -0400 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-02 10:56:49 -0400 |
commit | babd981e41fe3a385abf4ee398479124e0776687 (patch) | |
tree | 8c2d7149365c48864aaf2e06f7fee5a182c9a4d6 /sql/unireg.h | |
parent | c932049cbd8de6b25020b2956d15c4c664c03dc5 (diff) | |
parent | a9e658408fd40ed9485654539b334b92272361c0 (diff) | |
download | mariadb-git-babd981e41fe3a385abf4ee398479124e0776687.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
sql/field.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/r/type_blob.result:
Manual merge.
mysql-test/t/type_blob.test:
Manual merge.
Diffstat (limited to 'sql/unireg.h')
-rw-r--r-- | sql/unireg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index d8301060cc4..b605f7d04e7 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -60,6 +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 CONVERT_IF_BIGGER_TO_BLOB 512 /* Used for CREATE ... SELECT */ /* Max column width +1 */ |