diff options
| author | unknown <bar@mysql.com> | 2006-01-12 11:38:09 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-01-12 11:38:09 +0400 |
| commit | b49ea12f57ef43506f86841c99544d86695bd6ae (patch) | |
| tree | 311a22bcb34b3207647ef7370a2c62b2d47471c6 /sql/field.cc | |
| parent | 4eb2b162c53c52aa3e0ea593e73b27954e3692be (diff) | |
| parent | f00e5b36c719ff3a2ef5d43a7f6a5ffeb4b5b71d (diff) | |
| download | mariadb-git-b49ea12f57ef43506f86841c99544d86695bd6ae.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/r/ctype_utf8.result:
After-merge fix.
sql/field.cc:
After merge fix.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 1f3649e1b88..d72c4913d99 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8981,11 +8981,11 @@ uint32 Field_blob::max_length() switch (packlength) { case 1: - return 255; + return 255 * field_charset->mbmaxlen; case 2: - return 65535; + return 65535 * field_charset->mbmaxlen; case 3: - return 16777215; + return 16777215 * field_charset->mbmaxlen; case 4: return (uint32) 4294967295U; default: |