merging

2008-08-26 15:58:41 +05:00 · 2008-08-26 15:58:41 +05:00 · 0b19617de7
commit 0b19617de7
parent ebe1b65ee3 d45e478cc7
2 changed files with 0 additions and 3 deletions
--- a/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
@ -1,2 +1 @@
 ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
-
--- a/mysql-test/suite/jp/t/disabled.def
+++ b/mysql-test/suite/jp/t/disabled.def
@ -9,5 +9,3 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-jp_convert_sjis      : Bug#36597 Testsuite "jp": Suspicious results for some tests
-jp_select_sjis       : Bug#36597 Testsuite "jp": Suspicious results for some tests
				`@ -1,2 +1 @@`
				`ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤`