summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-04-21 11:29:50 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-04-21 11:29:50 +0400
commit5fc5195fc5e5adfcbf63dd1297495e77399e2a32 (patch)
tree771736f06d92cee64adc8121a8a123e7dbdc4799
parentcfa4548ba5277166fe768994b0c3fde0709088a7 (diff)
downloadmariadb-git-5fc5195fc5e5adfcbf63dd1297495e77399e2a32.tar.gz
An after-fix for
MDEV-6134 SUBSTRING_INDEX returns wrong result for 8bit character sets when delimiter is not found Recording the forgotten test results.
-rw-r--r--mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result9
-rw-r--r--[-rwxr-xr-x]mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result9
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result b/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
index 43108222866..d12097b15b7 100644
--- a/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
+++ b/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
@@ -74,6 +74,15 @@ select 1 from t1 order by cast(a as char(1));
1
1
drop table t1;
+#
+# MDEV-6134 SUBSTRING_INDEX returns wrong result for 8bit character sets when delimiter is not found
+#
+SET character_set_client=latin1;
+SET character_set_connection= @test_character_set;
+SET collation_connection= @test_collation;
+SELECT COLLATION('.'), SUBSTRING_INDEX('.wwwmysqlcom', '.', -2) AS c1;
+COLLATION('.') c1
+cp932_japanese_ci .wwwmysqlcom
set names utf8;
create table t1 (
name varchar(10),
diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
index 43108222866..d12097b15b7 100755..100644
--- a/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result
@@ -74,6 +74,15 @@ select 1 from t1 order by cast(a as char(1));
1
1
drop table t1;
+#
+# MDEV-6134 SUBSTRING_INDEX returns wrong result for 8bit character sets when delimiter is not found
+#
+SET character_set_client=latin1;
+SET character_set_connection= @test_character_set;
+SET collation_connection= @test_collation;
+SELECT COLLATION('.'), SUBSTRING_INDEX('.wwwmysqlcom', '.', -2) AS c1;
+COLLATION('.') c1
+cp932_japanese_ci .wwwmysqlcom
set names utf8;
create table t1 (
name varchar(10),