From 5fc5195fc5e5adfcbf63dd1297495e77399e2a32 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 21 Apr 2014 11:29:50 +0400 Subject: [PATCH] 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. --- mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result | 9 +++++++++ mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result | 9 +++++++++ 2 files changed, 18 insertions(+) mode change 100755 => 100644 mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result 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 old mode 100755 new mode 100644 index 43108222866..d12097b15b7 --- 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),