merging

0b19617d · Alexey Botchkov · ebe1b65e · d45e478c · 0b19617d · 0b19617d
Commit 0b19617d authored Aug 26, 2008 by Alexey Botchkov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

mysql-test/suite/jp/std_data/jisx0208_sjis2.dat mysql-test/suite/jp/std_data/jisx0208_sjis2.dat +0 -1

mysql-test/suite/jp/t/disabled.def mysql-test/suite/jp/t/disabled.def +0 -2

No files found.
--- a/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
+++ b/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
 \\\\\\\\\\\\\\\\\\\\
--- 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