summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-02-03 16:07:32 -0800
committerunknown <jimw@mysql.com>2005-02-03 16:07:32 -0800
commitd41473f3c63c4f770f1bb28f1729331d4f780ada (patch)
tree7212a22c35abcccce68cd7af551d4bb98a3bfcb7 /mysql-test
parentd743b102624bf13207a533a27580ff2d86eb86d0 (diff)
downloadmariadb-git-d41473f3c63c4f770f1bb28f1729331d4f780ada.tar.gz
Fix error in parsing string literals containing a backslash followed
by a multi-byte character with a second byte of 0x5c (\). (Bug #8903) sql/sql_lex.cc: Fix lex error when multi-byte character containing 0x5c (\) follows a backslash mysql-test/t/ctype_sjis.test: Add regression test for Bug #8303 mysql-test/r/ctype_sjis.result: Add test results
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ctype_sjis.result4
-rw-r--r--mysql-test/t/ctype_sjis.test7
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/r/ctype_sjis.result
index 1f414f89e20..98e5992f374 100644
--- a/mysql-test/r/ctype_sjis.result
+++ b/mysql-test/r/ctype_sjis.result
@@ -91,3 +91,7 @@ sjis_bin 6109
sjis_bin 61
sjis_bin 6120
drop table t1;
+SET NAMES sjis;
+SELECT HEX('@\\') FROM DUAL;
+HEX('@_\')
+8DB2939181408C5C
diff --git a/mysql-test/t/ctype_sjis.test b/mysql-test/t/ctype_sjis.test
index 58ca3c6a997..50d286f28b9 100644
--- a/mysql-test/t/ctype_sjis.test
+++ b/mysql-test/t/ctype_sjis.test
@@ -68,3 +68,10 @@ SET collation_connection='sjis_japanese_ci';
-- source include/ctype_filesort.inc
SET collation_connection='sjis_bin';
-- source include/ctype_filesort.inc
+
+# Check parsing of string literals in SJIS with multibyte characters that
+# have an embedded \ in them. (Bug #8303)
+
+--character_set sjis
+SET NAMES sjis;
+SELECT HEX('@\\') FROM DUAL;