diff options
Diffstat (limited to 'mysql-test/main/ctype_utf16.test')
-rw-r--r-- | mysql-test/main/ctype_utf16.test | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/main/ctype_utf16.test b/mysql-test/main/ctype_utf16.test index c2807a19215..d95bc2ed76e 100644 --- a/mysql-test/main/ctype_utf16.test +++ b/mysql-test/main/ctype_utf16.test @@ -1,7 +1,6 @@ -- source include/have_utf16.inc -- source include/have_utf8mb4.inc - SET TIME_ZONE='+03:00'; --disable_warnings @@ -11,6 +10,7 @@ DROP TABLE IF EXISTS t1; --echo # --echo # Start of 5.5 tests --echo # +--disable_service_connection SET NAMES latin1; SET character_set_connection=utf16; @@ -52,6 +52,8 @@ DROP TABLE t1; # # Check LPAD/RPAD # +#enable after fix MDEV-29290 +--disable_view_protocol SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'0421')); SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'04210422')); SELECT hex(LPAD(_utf16 X'0420',10,_utf16 X'042104220423')); @@ -65,6 +67,7 @@ SELECT hex(RPAD(_utf16 X'0420',10,_utf16 X'042104220423')); SELECT hex(RPAD(_utf16 X'0420042104220423042404250426042704280429042A042B',10,_utf16 X'042104220423')); SELECT hex(RPAD(_utf16 X'D800DC00', 10, _utf16 X'0421')); SELECT hex(RPAD(_utf16 X'0421', 10, _utf16 X'D800DC00')); +--enable_view_protocol CREATE TABLE t1 SELECT LPAD(_utf16 X'0420',10,_utf16 X'0421') l, @@ -738,6 +741,7 @@ CREATE TABLE t1 ( s3 MEDIUMTEXT CHARACTER SET utf16, s4 LONGTEXT CHARACTER SET utf16 ); +--disable_view_protocol --enable_metadata SET NAMES utf8, @@character_set_results=NULL; SELECT *, HEX(s1) FROM t1; @@ -746,6 +750,7 @@ SELECT *, HEX(s1) FROM t1; SET NAMES utf8; SELECT *, HEX(s1) FROM t1; --disable_metadata +--enable_view_protocol CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; SHOW CREATE TABLE t2; DROP TABLE t1, t2; @@ -950,7 +955,7 @@ DROP TABLE t1; VALUES (1) UNION SELECT _utf16 0x0020; VALUES ('') UNION SELECT _utf16 0x0020 COLLATE utf16_bin; VALUES ('') UNION VALUES ( _utf16 0x0020 COLLATE utf16_bin); - +--enable_service_connection --echo # --echo # End of 10.3 tests |