conflicts:
  Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
  Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test

 - Increase number of transaction objects available in ndbd
 - Most likely this is a timing related issue.

BUG#41003 reached our trees.

 - Fix faulty regex used for filtering out suspicious warnings, causing
   warnings/errors from previous tests to be reported

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"

 - Disable the two patterns that previously have been faulty - for now.

 - Improve error message for "found warnings in server log file"

 - First try LOAD DATA INFILE and fall back to LOAD DATA LOCAL INFILE if
   that fails.

 - Fix the regex for finding core files ie. anything that starts with "core" 
 - Add collection of *.dmp files on windows.

 - Use empty escape char as not to convert "\test" to a tab + "est"
   when loading the servers .err file

 - Remove double escape of [ and ]

 - Bypass --secure-file-priv by loading the file from the client
   using LOAD DATA LOCAL INFILE

 - Make a rough filtering of the servers error log and write
   all suspicious warnings to $error_log.warnings
   The .warnings file is then examined more carefully by check_warnings.test
 - This will speed things up, doing all of this in a server running
   under valgrind takes far too long time.

 - Add a "skip-ssl=1" to [mysqltest] section so that 
   mysqltest will not run with ssl turned on by default 
   but stil be able to turn it on when requested
 - This avoids that check_warnings and check_testcase
   connects to the server woth SSL turned on

The test fails with timeout when applying diff on two tables.

In this test case, there can be a situation when the slave is not yet synced
with the master, thence the changes may not be on the slave at diff time.

This patch addresses this issue by synchronizing master and slave before the
diff takes place.

 - pass empty "--plugin-dir" if simple parser was not found.

 - Pass verbose flag to My::SafeProcess also when starting
   check_warnings and run_on_all

 - Suppress intentional safemalloc dump warnings
 - add fflush(stdout) to make sure that the "End safemalloc memory dump." marker is flushed.

 - rewrite "check warnings" to be faster by not creating a full join
   between error_log and suspicious_patterns while running REGEXP.
   Instead add a column to error_log that will be set to 1 to indicate
   a warning and run the 6 REGEXP's we have for suspicious lines as
   6 separate full table scans.
 - Remove the "suspicious_patterns" table from mtr db
 - Use 'xykls37' as separator when loading the error log, that line should
   hopefully never exist in a line that should be a warning

 - default parallel to 1(again)

 - turn auto detection of parallelism value ON again

 - disable check of .err-old until bug has been fixed

 - fix typo, use "$old_log_error" as name when loading from .err-old file

 - extend debug prints for "permission denied"

 - Clear test variables "comment" and "logfile" to make sure thay aren't
  already set from previous run of same test
 - Print warning if test result already set and set it anyway

 - fix typo

 - Don't save ndb_*_fs directory after test failure

 - Add name of error log file to the erro log table to get better
   erorr message when warning is found

 - Add debug prints for analyzing mkdir "Permission denied" failure

 - Rewrite "check testcase" to use LOAD DATA INFILE instead of 'load_file'
   in order to speed up the reading of the servers error log.

mysql-test/include/check-warnings.test:
  Use LOAD DATA to load the servers error log into error_log table and then
  call 'check_warning' stored procedure to filter out any unexpected warnings

conflicts:
  Text conflict in client/mysqltest.cc
  Text conflict in mysql-test/include/wait_until_connected_again.inc
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
  Text conflict in mysql-test/r/events_bugs.result
  Text conflict in mysql-test/r/log_state.result
  Text conflict in mysql-test/r/myisam_data_pointer_size_func.result
  Text conflict in mysql-test/r/mysqlcheck.result
  Text conflict in mysql-test/r/query_cache.result
  Text conflict in mysql-test/r/status.result
  Text conflict in mysql-test/suite/binlog/r/binlog_index.result
  Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result
  Text conflict in mysql-test/suite/rpl/r/rpl_packet.result
  Text conflict in mysql-test/suite/rpl/t/rpl_packet.test
  Text conflict in mysql-test/t/disabled.def
  Text conflict in mysql-test/t/events_bugs.test
  Text conflict in mysql-test/t/log_state.test
  Text conflict in mysql-test/t/myisam_data_pointer_size_func.test
  Text conflict in mysql-test/t/mysqlcheck.test
  Text conflict in mysql-test/t/query_cache.test
  Text conflict in mysql-test/t/rpl_init_slave_func.test
  Text conflict in mysql-test/t/status.test