database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-16729 VARCHAR COMPRESSED is created with a wrong length for multi-byte character sets

Browse Source 
Field_varstring::sql_type() did not calculate character length correctly.
Using char_length() instead of the bad code.
This commit is contained in:
Alexander Barkov
2018-07-24 13:19:31 +04:00
parent a86a02a844
commit f74d2a9faa
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/main/column_compression.result
View File

@ -1472,3 +1472,17 @@ SELECT LEFT(a, 10), LENGTH(a) FROM t1;
LEFT(a, 10) LENGTH(a) LEFT(a, 10) LENGTH(a)
aaaaaaaaaa 255 aaaaaaaaaa 255
DROP TABLE t1; DROP TABLE t1;
#
# MDEV-16729 VARCHAR COMPRESSED is created with a wrong length for multi-byte character sets
#
CREATE OR REPLACE TABLE t1 (a VARCHAR(1000) CHARACTER SET utf8 COMPRESSED);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(1000) /*!100301 COMPRESSED*/ CHARACTER SET utf8 DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
COLUMN_TYPE
varchar(1000) /*!100301 COMPRESSED*/
DROP TABLE t1;

11
mysql-test/main/column_compression.test
View File

@ -170,3 +170,14 @@ CREATE TABLE t1(a TINYTEXT COMPRESSED);
INSERT INTO t1 VALUES(REPEAT('a', 255)); INSERT INTO t1 VALUES(REPEAT('a', 255));
SELECT LEFT(a, 10), LENGTH(a) FROM t1; SELECT LEFT(a, 10), LENGTH(a) FROM t1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # MDEV-16729 VARCHAR COMPRESSED is created with a wrong length for multi-byte character sets
--echo #
CREATE OR REPLACE TABLE t1 (a VARCHAR(1000) CHARACTER SET utf8 COMPRESSED);
SHOW CREATE TABLE t1;
SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
DROP TABLE t1;

5
sql/field.cc
View File

@ -7715,10 +7715,9 @@ void Field_varstring::sql_type(String &res) const
size_t length; size_t length;
length= cs->cset->snprintf(cs,(char*) res.ptr(), length= cs->cset->snprintf(cs,(char*) res.ptr(),
res.alloced_length(), "%s(%d)", res.alloced_length(), "%s(%u)",
(has_charset() ? "varchar" : "varbinary"), (has_charset() ? "varchar" : "varbinary"),
(int) field_length / charset()->mbmaxlen - (uint) char_length());
MY_TEST(compression_method()));
res.length(length); res.length(length);
if ((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) && if ((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) &&
has_charset() && (charset()->state & MY_CS_BINSORT)) has_charset() && (charset()->state & MY_CS_BINSORT))