merge: 5.1-rpl -> 5.1-rpl-merge

4 files changed, 14 insertions, 7 deletions

diff --git a/mysql-test/include/default_ndbd.cnf b/mysql-test/include/default_ndbd.cnf
index 784d81beabc..9a88a5936aa 100644
--- a/mysql-test/include/default_ndbd.cnf
+++ b/mysql-test/include/default_ndbd.cnf
@@ -1,7 +1,7 @@
 
 [cluster_config]
 MaxNoOfSavedMessages=          1000
-MaxNoOfConcurrentTransactions= 64
+MaxNoOfConcurrentTransactions= 128
 MaxNoOfConcurrentOperations=   10000
 DataMemory=                    20M
 IndexMemory=                   1M
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
index ce29f9a42ad..00a9aba11cb 100644
--- a/mysql-test/lib/mtr_report.pm
+++ b/mysql-test/lib/mtr_report.pm
@@ -118,7 +118,7 @@ sub mtr_report_test ($) {
 
     if ( $warnings )
     {
-      mtr_report("[ fail ]  Found warnings in server log file!");
+      mtr_report("[ fail ]  Found warnings/errors in server log file!");
       mtr_report("        Test ended at $timest");
       mtr_report($warnings);
       return;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 42c243cad8c..5d8b1371151 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3388,7 +3388,7 @@ sub extract_warning_lines ($) {
   my @lines;
   while ( my $line = <$Ferr> )
   {
-    if ( $line =~ /"^CURRENT_TEST:"/ )
+    if ( $line =~ /^CURRENT_TEST:/ )
     {
       # Throw away lines from previous tests
       @lines = ();
@@ -3425,8 +3425,15 @@ sub extract_warning_lines ($) {
 
   my @patterns =
     (
-     qr/^Warning:|mysqld: Warning|\[Warning\]/,
-     qr/^Error:|\[ERROR\]/,
+     # The patterns for detection of [Warning] and [ERROR]
+     # in the server log files have been faulty for a longer period
+     # and correcting them shows a few additional harmless warnings.
+     # Thus those patterns are temporarily removed from the list
+     # of patterns. For more info see BUG#42408
+     # qr/^Warning:|mysqld: Warning|\[Warning\]/,
+     # qr/^Error:|\[ERROR\]/,
+     qr/^Warning:|mysqld: Warning/,
+     qr/^Error:/,
      qr/^==.* at 0x/,
      qr/InnoDB: Warning|InnoDB: Error/,
      qr/^safe_mutex:|allocated at line/,
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 1c461ab47bb..118efb6f7ed 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -10,7 +10,7 @@
 #
 ##############################################################################
 delayed_insert_limit_func             : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
-event_scheduler_func                  : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
+event_scheduler_func                  : BUG#37962, BUG#40816 2008-07-08 sven *_func tests containing sleeps/race conditions
 interactive_timeout_func              : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
 query_cache_wlock_invalidate_func     : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
 rpl_init_slave_func                   : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
@@ -18,9 +18,9 @@ rpl_max_binlog_size_func              : BUG#37962 2008-07-08 sven *_func tests c
 slow_query_log_func                   : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
 sql_low_priority_updates_func         : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
 timestamp_func                        : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
-log_bin_trust_function_creators_func : Bug#41003 Dec-12-2008 andrei todo:re-enable after merging the bug fixes from the main trees.
 innodb_max_dirty_pages_pct_func       : BUG#41018 BUG#39382 2008-12-02 sven test fails often. some failures fill up the disk, causing subsequent failures in many other tests
 federated_transactions   : Bug#29523 Transactions do not work
 wait_timeout_func    : Bug #41225 joro wait_timeout_func fails
 kill                     : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 query_cache_28249        : Bug#41098 Query Cache returns wrong result with concurrent insert
+innodb_bug39438          : BUG#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"