bzr commit into mysql-6.0 branch (bar:2800)

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-6.0-bugteam/

 2800 Alexander Barkov	2008-08-26 [merge]
      Merging bugfix from 5.1-bugteam
modified:
  mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
  mysql-test/suite/jp/t/disabled.def

=== modified file 'mysql-test/suite/jp/std_data/jisx0208_sjis2.dat'
--- a/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat	2005-01-07 12:32:05 +0000
+++ b/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat	2008-07-29 05:43:57 +0000
@@ -1,2 +1 @@
 �\�\�\�\�\�\�\�\�\�\ile 'mysql-test/suite/jp/t/disabled.def'
--- a/mysql-test/suite/jp/t/disabled.def	2008-05-15 16:01:13 +0000
+++ b/mysql-test/suite/jp/t/disabled.def	2008-07-29 05:43:57 +0000
@@ -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