bzr push into mysql-6.0-backup branch (rsomla:2669)

[Rafal Somla]

 2669 Rafal Somla	2008-07-15 [merge]
      Auto merge.
modified:
  mysql-test/r/ctype_utf32.result
  mysql-test/suite/falcon/r/falcon_bug_32833.result
  mysql-test/t/ctype_utf32.test
  strings/ctype-ucs2.c

=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def	2008-07-14 14:56:49 +0000
+++ b/mysql-test/suite/parts/t/disabled.def	2008-07-15 11:38:47 +0000
@@ -10,3 +10,5 @@ partition_value_ndb            : Bug#305
 partition_alter4_myisam        : Bug#20129 / WL#4176
 partition_alter4_innodb        : Bug#20129 / WL#4176
 partition_auto_increment_falcon : Bug#36595 2008-05-08 test crashes
+
+ndb_dd_backuprestore           : Bug#32659 2008-07-14 alik  Disabled to make 6.0 greaner (the test fails too often)

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2008-06-20 19:24:46 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-07-14 16:34:51 +0000
@@ -30,3 +30,8 @@ rpl_row_basic_7ndb         : BUG#33360 2
 rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)
 rpl_innodb_bug28430        : Failure on Solaris Bug #36793
 rpl_server_id1             : Bug #36818 rpl_server_id1 fails expecting slave has stopped (azundris)
+
+rpl_row_basic_2myisam      : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
+rpl_row_basic_3innodb      : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
+rpl_heartbeat              : Bug#37714 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
+rpl_idempotency            : Bug#37767 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)

=== modified file 'mysql-test/t/myisamlog.test'
--- a/mysql-test/t/myisamlog.test	2008-07-09 14:27:18 +0000
+++ b/mysql-test/t/myisamlog.test	2008-07-15 11:37:30 +0000
@@ -3,6 +3,12 @@
 
 --source include/not_embedded.inc
 
+#
+# This test fails on win platforms currently. Ingo is working on a fix - no bug
+# reported yet.
+#
+--source include/not_windows.inc
+
 disable_warnings;
 create database if not exists mysqltest;
 use mysqltest;