summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorkent@mysql.com <>2006-05-24 00:55:53 +0200
committerkent@mysql.com <>2006-05-24 00:55:53 +0200
commit97674810b0fab186733ecb6e36ae8431c7bb7472 (patch)
treeabf866cbea4dcc9f5363defee88ee1d555dde106 /mysql-test/r
parentf353bec511bc1346d7ff7d99526004108e7015bf (diff)
downloadmariadb-git-97674810b0fab186733ecb6e36ae8431c7bb7472.tar.gz
don't let bugfix for bug#8303 break the bugfix for bug#8378
revert the fix for bug#8303 correct the test for bug#8378
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/ctype_sjis.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_sjis.result b/mysql-test/r/ctype_sjis.result
index d1976a516d2..dab5991b505 100644
--- a/mysql-test/r/ctype_sjis.result
+++ b/mysql-test/r/ctype_sjis.result
@@ -172,6 +172,6 @@ c2h
ab_def
drop table t1;
SET NAMES sjis;
-SELECT HEX('@\\') FROM DUAL;
-HEX('@_\')
+SELECT HEX('@\') FROM DUAL;
+HEX('@\')
8DB2939181408C5C