diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-24 14:53:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-24 14:53:18 +0200 |
| commit | e0a1c745ec3ed1ec6c0375a2a624697c29f480a6 (patch) | |
| tree | 24ded2c6ebe3ea3413ce56af89ea0f2f63bb3a39 /sql/sql_const.h | |
| parent | 4ec88ea9c3ec52d996b39167d12a61ab95fdeacc (diff) | |
| parent | 2aa51f528fd5d23cc54eca8fbd07e88e7b2993c7 (diff) | |
| download | mariadb-git-e0a1c745ec3ed1ec6c0375a2a624697c29f480a6.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_const.h')
| -rw-r--r-- | sql/sql_const.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sql/sql_const.h b/sql/sql_const.h index 95960ac131a..c91992a9029 100644 --- a/sql/sql_const.h +++ b/sql/sql_const.h @@ -45,7 +45,18 @@ #define MAX_MBWIDTH 3 /* Max multibyte sequence */ #define MAX_FILENAME_MBWIDTH 5 #define MAX_FIELD_CHARLENGTH 255 -#define MAX_FIELD_VARCHARLENGTH 65535 +/* + In MAX_FIELD_VARCHARLENGTH we reserve extra bytes for the overhead: + - 2 bytes for the length + - 1 byte for NULL bits + to avoid the "Row size too large" error for these three corner definitions: + CREATE TABLE t1 (c VARBINARY(65533)); + CREATE TABLE t1 (c VARBINARY(65534)); + CREATE TABLE t1 (c VARBINARY(65535)); + Like VARCHAR(65536), they will be converted to BLOB automatically + in non-sctict mode. +*/ +#define MAX_FIELD_VARCHARLENGTH (65535-2-1) #define MAX_FIELD_BLOBLENGTH UINT_MAX32 /* cf field_blob::get_length() */ #define CONVERT_IF_BIGGER_TO_BLOB 512 /* Threshold *in characters* */ |