Commit 768751c7 authored by Alexander Barkov's avatar Alexander Barkov

Merge 5.5->10.0-base

parents 07445510 dc407270
...@@ -13,3 +13,14 @@ delete from t1; ...@@ -13,3 +13,14 @@ delete from t1;
insert into t1 values ('a'), ('a '), ('a\t'); insert into t1 values ('a'), ('a '), ('a\t');
select collation(a),hex(a) from t1 order by a; select collation(a),hex(a) from t1 order by a;
drop table t1; drop table t1;
--echo #
--echo # MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
--echo #
SELECT @@collation_connection;
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
DROP TABLE t1;
...@@ -103,6 +103,23 @@ big5_chinese_ci 6109 ...@@ -103,6 +103,23 @@ big5_chinese_ci 6109
big5_chinese_ci 61 big5_chinese_ci 61
big5_chinese_ci 6120 big5_chinese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
big5_chinese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
...@@ -170,6 +187,23 @@ big5_bin 6109 ...@@ -170,6 +187,23 @@ big5_bin 6109
big5_bin 61 big5_bin 61
big5_bin 6120 big5_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
big5_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
......
...@@ -9809,6 +9809,23 @@ eucjpms_japanese_ci 6109 ...@@ -9809,6 +9809,23 @@ eucjpms_japanese_ci 6109
eucjpms_japanese_ci 61 eucjpms_japanese_ci 61
eucjpms_japanese_ci 6120 eucjpms_japanese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
eucjpms_japanese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
CREATE TABLE t1 AS CREATE TABLE t1 AS
SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d; SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;
ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b); ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);
...@@ -9836,6 +9853,23 @@ eucjpms_bin 6109 ...@@ -9836,6 +9853,23 @@ eucjpms_bin 6109
eucjpms_bin 61 eucjpms_bin 61
eucjpms_bin 6120 eucjpms_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
eucjpms_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
CREATE TABLE t1 AS CREATE TABLE t1 AS
SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d; SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;
ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b); ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);
......
...@@ -103,6 +103,23 @@ euckr_korean_ci 6109 ...@@ -103,6 +103,23 @@ euckr_korean_ci 6109
euckr_korean_ci 61 euckr_korean_ci 61
euckr_korean_ci 6120 euckr_korean_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
euckr_korean_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
...@@ -170,6 +187,23 @@ euckr_bin 6109 ...@@ -170,6 +187,23 @@ euckr_bin 6109
euckr_bin 61 euckr_bin 61
euckr_bin 6120 euckr_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
euckr_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
......
...@@ -103,6 +103,23 @@ gb2312_chinese_ci 6109 ...@@ -103,6 +103,23 @@ gb2312_chinese_ci 6109
gb2312_chinese_ci 61 gb2312_chinese_ci 61
gb2312_chinese_ci 6120 gb2312_chinese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
gb2312_chinese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
...@@ -170,6 +187,23 @@ gb2312_bin 6109 ...@@ -170,6 +187,23 @@ gb2312_bin 6109
gb2312_bin 61 gb2312_bin 61
gb2312_bin 6120 gb2312_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
gb2312_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
......
...@@ -103,6 +103,23 @@ gbk_chinese_ci 6109 ...@@ -103,6 +103,23 @@ gbk_chinese_ci 6109
gbk_chinese_ci 61 gbk_chinese_ci 61
gbk_chinese_ci 6120 gbk_chinese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
gbk_chinese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
...@@ -170,6 +187,23 @@ gbk_bin 6109 ...@@ -170,6 +187,23 @@ gbk_bin 6109
gbk_bin 61 gbk_bin 61
gbk_bin 6120 gbk_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
gbk_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
......
...@@ -318,6 +318,23 @@ latin1_swedish_ci 6109 ...@@ -318,6 +318,23 @@ latin1_swedish_ci 6109
latin1_swedish_ci 61 latin1_swedish_ci 61
latin1_swedish_ci 6120 latin1_swedish_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
latin1_swedish_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
latin1_swedish_ci latin1_swedish_ci
...@@ -365,6 +382,23 @@ latin1_bin 6109 ...@@ -365,6 +382,23 @@ latin1_bin 6109
latin1_bin 61 latin1_bin 61
latin1_bin 6120 latin1_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
latin1_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
latin1_bin latin1_bin
......
...@@ -326,6 +326,23 @@ latin1_german2_ci 6109 ...@@ -326,6 +326,23 @@ latin1_german2_ci 6109
latin1_german2_ci 61 latin1_german2_ci 61
latin1_german2_ci 6120 latin1_german2_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
latin1_german2_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
drop table if exists t1; drop table if exists t1;
create table t1 as select repeat(' ', 64) as s1; create table t1 as select repeat(' ', 64) as s1;
select collation(s1) from t1; select collation(s1) from t1;
......
...@@ -81,6 +81,23 @@ sjis_japanese_ci 6109 ...@@ -81,6 +81,23 @@ sjis_japanese_ci 6109
sjis_japanese_ci 61 sjis_japanese_ci 61
sjis_japanese_ci 6120 sjis_japanese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
sjis_japanese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
...@@ -167,6 +184,23 @@ sjis_bin 6109 ...@@ -167,6 +184,23 @@ sjis_bin 6109
sjis_bin 61 sjis_bin 61
sjis_bin 6120 sjis_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
sjis_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
......
...@@ -2947,6 +2947,23 @@ tis620_thai_ci 6109 ...@@ -2947,6 +2947,23 @@ tis620_thai_ci 6109
tis620_thai_ci 61 tis620_thai_ci 61
tis620_thai_ci 6120 tis620_thai_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
tis620_thai_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
tis620_thai_ci tis620_thai_ci
...@@ -2975,6 +2992,23 @@ tis620_bin 6109 ...@@ -2975,6 +2992,23 @@ tis620_bin 6109
tis620_bin 61 tis620_bin 61
tis620_bin 6120 tis620_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
tis620_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
tis620_bin tis620_bin
......
...@@ -2767,6 +2767,23 @@ utf8_unicode_ci 6109 ...@@ -2767,6 +2767,23 @@ utf8_unicode_ci 6109
utf8_unicode_ci 61 utf8_unicode_ci 61
utf8_unicode_ci 6120 utf8_unicode_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8_unicode_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8_unicode_ci utf8_unicode_ci
......
...@@ -734,6 +734,23 @@ ucs2_general_ci 00610009 ...@@ -734,6 +734,23 @@ ucs2_general_ci 00610009
ucs2_general_ci 0061 ucs2_general_ci 0061
ucs2_general_ci 00610020 ucs2_general_ci 00610020
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
ucs2_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
ucs2_general_ci ucs2_general_ci
...@@ -834,6 +851,23 @@ ucs2_bin 00610009 ...@@ -834,6 +851,23 @@ ucs2_bin 00610009
ucs2_bin 0061 ucs2_bin 0061
ucs2_bin 00610020 ucs2_bin 00610020
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
ucs2_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
ucs2_bin ucs2_bin
......
...@@ -2217,6 +2217,23 @@ ujis_japanese_ci 6109 ...@@ -2217,6 +2217,23 @@ ujis_japanese_ci 6109
ujis_japanese_ci 61 ujis_japanese_ci 61
ujis_japanese_ci 6120 ujis_japanese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
ujis_japanese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
...@@ -2284,6 +2301,23 @@ ujis_bin 6109 ...@@ -2284,6 +2301,23 @@ ujis_bin 6109
ujis_bin 61 ujis_bin 61
ujis_bin 6120 ujis_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
ujis_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
create table t1 engine=innodb select repeat('a',50) as c1; create table t1 engine=innodb select repeat('a',50) as c1;
alter table t1 add index(c1(5)); alter table t1 add index(c1(5));
insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111'); insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');
......
...@@ -583,6 +583,23 @@ utf16_general_ci 00610009 ...@@ -583,6 +583,23 @@ utf16_general_ci 00610009
utf16_general_ci 0061 utf16_general_ci 0061
utf16_general_ci 00610020 utf16_general_ci 00610020
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf16_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf16_general_ci utf16_general_ci
...@@ -613,6 +630,23 @@ utf16_bin 0061 ...@@ -613,6 +630,23 @@ utf16_bin 0061
utf16_bin 00610020 utf16_bin 00610020
drop table t1; drop table t1;
# #
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf16_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
#
# Bug#55980 Character sets: supplementary character _bin ordering is wrong # Bug#55980 Character sets: supplementary character _bin ordering is wrong
# #
CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a LIMIT 0; CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a LIMIT 0;
......
...@@ -2272,6 +2272,23 @@ utf16_unicode_ci 00610009 ...@@ -2272,6 +2272,23 @@ utf16_unicode_ci 00610009
utf16_unicode_ci 0061 utf16_unicode_ci 0061
utf16_unicode_ci 00610020 utf16_unicode_ci 00610020
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf16_unicode_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf16_unicode_ci utf16_unicode_ci
......
...@@ -582,6 +582,23 @@ utf32_general_ci 0000006100000009 ...@@ -582,6 +582,23 @@ utf32_general_ci 0000006100000009
utf32_general_ci 00000061 utf32_general_ci 00000061
utf32_general_ci 0000006100000020 utf32_general_ci 0000006100000020
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf32_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf32_general_ci utf32_general_ci
...@@ -612,6 +629,23 @@ utf32_bin 00000061 ...@@ -612,6 +629,23 @@ utf32_bin 00000061
utf32_bin 0000006100000020 utf32_bin 0000006100000020
drop table t1; drop table t1;
# #
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf32_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
#
# Bug#55980 Character sets: supplementary character _bin ordering is wrong # Bug#55980 Character sets: supplementary character _bin ordering is wrong
# #
CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a LIMIT 0; CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a LIMIT 0;
......
...@@ -2272,6 +2272,23 @@ utf32_unicode_ci 0000006100000009 ...@@ -2272,6 +2272,23 @@ utf32_unicode_ci 0000006100000009
utf32_unicode_ci 00000061 utf32_unicode_ci 00000061
utf32_unicode_ci 0000006100000020 utf32_unicode_ci 0000006100000020
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf32_unicode_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf32_unicode_ci utf32_unicode_ci
......
...@@ -924,6 +924,23 @@ utf8_general_ci 6109 ...@@ -924,6 +924,23 @@ utf8_general_ci 6109
utf8_general_ci 61 utf8_general_ci 61
utf8_general_ci 6120 utf8_general_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8_general_ci utf8_general_ci
...@@ -1006,6 +1023,23 @@ utf8_bin 6109 ...@@ -1006,6 +1023,23 @@ utf8_bin 6109
utf8_bin 61 utf8_bin 61
utf8_bin 6120 utf8_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8_bin utf8_bin
......
...@@ -924,6 +924,23 @@ utf8mb4_general_ci 6109 ...@@ -924,6 +924,23 @@ utf8mb4_general_ci 6109
utf8mb4_general_ci 61 utf8mb4_general_ci 61
utf8mb4_general_ci 6120 utf8mb4_general_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8mb4_general_ci utf8mb4_general_ci
...@@ -988,6 +1005,23 @@ utf8mb4_bin 61 ...@@ -988,6 +1005,23 @@ utf8mb4_bin 61
utf8mb4_bin 6120 utf8mb4_bin 6120
drop table t1; drop table t1;
# #
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
#
# Bug#55980 Character sets: supplementary character _bin ordering is wrong # Bug#55980 Character sets: supplementary character _bin ordering is wrong
# #
CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a LIMIT 0; CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a LIMIT 0;
......
...@@ -863,6 +863,23 @@ utf8mb4_general_ci 6109 ...@@ -863,6 +863,23 @@ utf8mb4_general_ci 6109
utf8mb4_general_ci 61 utf8mb4_general_ci 61
utf8mb4_general_ci 6120 utf8mb4_general_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8mb4_general_ci utf8mb4_general_ci
...@@ -926,6 +943,23 @@ utf8mb4_bin 6109 ...@@ -926,6 +943,23 @@ utf8mb4_bin 6109
utf8mb4_bin 61 utf8mb4_bin 61
utf8mb4_bin 6120 utf8mb4_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8mb4_bin utf8mb4_bin
......
...@@ -924,6 +924,23 @@ utf8mb4_general_ci 6109 ...@@ -924,6 +924,23 @@ utf8mb4_general_ci 6109
utf8mb4_general_ci 61 utf8mb4_general_ci 61
utf8mb4_general_ci 6120 utf8mb4_general_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8mb4_general_ci utf8mb4_general_ci
...@@ -987,6 +1004,23 @@ utf8mb4_bin 6109 ...@@ -987,6 +1004,23 @@ utf8mb4_bin 6109
utf8mb4_bin 61 utf8mb4_bin 61
utf8mb4_bin 6120 utf8mb4_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8mb4_bin utf8mb4_bin
......
...@@ -924,6 +924,23 @@ utf8mb4_general_ci 6109 ...@@ -924,6 +924,23 @@ utf8mb4_general_ci 6109
utf8mb4_general_ci 61 utf8mb4_general_ci 61
utf8mb4_general_ci 6120 utf8mb4_general_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_general_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8mb4_general_ci utf8mb4_general_ci
...@@ -987,6 +1004,23 @@ utf8mb4_bin 6109 ...@@ -987,6 +1004,23 @@ utf8mb4_bin 6109
utf8mb4_bin 61 utf8mb4_bin 61
utf8mb4_bin 6120 utf8mb4_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
utf8mb4_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
select @@collation_connection; select @@collation_connection;
@@collation_connection @@collation_connection
utf8mb4_bin utf8mb4_bin
......
...@@ -11418,6 +11418,23 @@ cp932_japanese_ci 6109 ...@@ -11418,6 +11418,23 @@ cp932_japanese_ci 6109
cp932_japanese_ci 61 cp932_japanese_ci 61
cp932_japanese_ci 6120 cp932_japanese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
cp932_japanese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
CREATE TABLE t1 AS CREATE TABLE t1 AS
SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d; SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;
ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b); ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);
...@@ -11445,6 +11462,23 @@ cp932_bin 6109 ...@@ -11445,6 +11462,23 @@ cp932_bin 6109
cp932_bin 61 cp932_bin 61
cp932_bin 6120 cp932_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
cp932_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
CREATE TABLE t1 AS CREATE TABLE t1 AS
SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d; SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;
ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b); ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);
......
...@@ -11418,6 +11418,23 @@ cp932_japanese_ci 6109 ...@@ -11418,6 +11418,23 @@ cp932_japanese_ci 6109
cp932_japanese_ci 61 cp932_japanese_ci 61
cp932_japanese_ci 6120 cp932_japanese_ci 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
cp932_japanese_ci
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
CREATE TABLE t1 AS CREATE TABLE t1 AS
SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d; SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;
ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b); ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);
...@@ -11445,6 +11462,23 @@ cp932_bin 6109 ...@@ -11445,6 +11462,23 @@ cp932_bin 6109
cp932_bin 61 cp932_bin 61
cp932_bin 6120 cp932_bin 6120
drop table t1; drop table t1;
#
# MDEV-5453 Assertion `src' fails in my_strnxfrm_unicode on GROUP BY MID(..) WITH ROLLUP
#
SELECT @@collation_connection;
@@collation_connection
cp932_bin
CREATE TABLE t1 (i INT) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
SELECT * FROM t1 GROUP BY MID(CURRENT_USER,0) WITH ROLLUP;
i
1
1
SELECT * FROM t1 GROUP BY MID('test',0) WITH ROLLUP;
i
1
1
DROP TABLE t1;
CREATE TABLE t1 AS CREATE TABLE t1 AS
SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d; SELECT 10 AS a, REPEAT('a',20) AS b, REPEAT('a',8) AS c, REPEAT('a',8) AS d;
ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b); ALTER TABLE t1 ADD PRIMARY KEY(a), ADD KEY(b);
......
...@@ -2101,7 +2101,7 @@ my_strnxfrm_unicode(CHARSET_INFO *cs, ...@@ -2101,7 +2101,7 @@ my_strnxfrm_unicode(CHARSET_INFO *cs,
const uchar *se = src + srclen; const uchar *se = src + srclen;
MY_UNICASE_INFO * const*uni_plane= (cs->state & MY_CS_BINSORT) ? MY_UNICASE_INFO * const*uni_plane= (cs->state & MY_CS_BINSORT) ?
NULL : cs->caseinfo; NULL : cs->caseinfo;
DBUG_ASSERT(src); DBUG_ASSERT(!srclen || src);
while (dst < de_beg) while (dst < de_beg)
{ {
...@@ -2145,7 +2145,7 @@ my_strnxfrm_unicode_full_bin(CHARSET_INFO *cs, ...@@ -2145,7 +2145,7 @@ my_strnxfrm_unicode_full_bin(CHARSET_INFO *cs,
const uchar *se = src + srclen; const uchar *se = src + srclen;
LINT_INIT(wc); LINT_INIT(wc);
DBUG_ASSERT(src); DBUG_ASSERT(!srclen || src);
DBUG_ASSERT(cs->state & MY_CS_BINSORT); DBUG_ASSERT(cs->state & MY_CS_BINSORT);
while (dst < de_beg) while (dst < de_beg)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment