mysql-test/suite/jp/r/jp_create_db_sjis.result:
  hide mtr database
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
  hide mtr database
mysql-test/suite/jp/r/jp_create_db_ujis.result:
  hide mtr database
mysql-test/suite/jp/r/jp_create_db_utf8.result:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_sjis.test:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_ucs2.test:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_ujis.test:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_utf8.test:
  hide mtr database

Changed [ skip ] to [ skipped ] and removed optional .

  1 - MASTER_MYSOCK fixed inexistent environment variable.
  2 - Fixed mismatch in result files due to changes in MTR.

      
It seems that the length of the thick line printed by mtr when printing the 
suite name differs from mtr1 and mtr2, affecting the mtr filtering by PB2.
      
This patch addresses it by restoring the thick line length to 78 (original
length) instead of 60 (the one in mtr2).

mysql-test/r/change_user.result:
  Update test case result.
mysql-test/r/not_embedded_server.result:
  Update test case result.
mysql-test/t/change_user.test:
  Move newer (and better) version of the test case.
mysql-test/t/not_embedded_server.test:
  Move this test case over to change_user.test
  This version is deterministic.

      
The test case proposed by the bugfix fails in bugteam trees after merging new 
mtr from main. The failure is due to the fact that the binlog file location has
changed and is no more under $MYSQLTEST_VARDIR/log.
      
This patch fixes the test failure by setting the correct path to the binlog 
file.

test case was executed.

mysql-test/include/concurrent.inc:
  Drop created user.
mysql-test/r/concurrent_innodb_safelog.result:
  Update test case result.
mysql-test/r/concurrent_innodb_unsafelog.result:
  Update test case result.

mysql-test/r/cache_innodb.result:
  Update test case result.

test case was executed.

mysql-test/r/func_compress.result:
  Update test case result.
mysql-test/r/innodb_bug34300.result:
  Update test case result.
mysql-test/t/func_compress.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value.
mysql-test/t/innodb_bug34300.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value and enable query log.

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.

Temporarily blocking to run the test on windows.

Todo: remove the include upon setup_fake_relay_log has been fixed.


mysql-test/suite/rpl/t/rpl_cross_version.test:
  blocking to run the test on windows for a while.

BUG#41003 reached our trees.

            
If the system time is adjusted back during a query execution
(resulting in the end time being earlier than the start time)
the code that prints to the slow query log gets confused and 
prints unsigned negative numbers.
            
Fixed by not logging the statements that would have negative
execution time due to time shifts.
No test case since this would involve changing the system time.

sql/sql_parse.cc:
  Bug #35396: don't log queries with negative execution times 
  (due to shifts in system time).

      
After the earlier fix, mtr tests reports "table full" messages as warnings. This is 
expected, this patch fixes the mtr testframework to ignore the error message.

mysql-test/lib/mtr_report.pl:
  fixed mtr_report_stats to ignore the Table Full error messages generated by the testcases main.almost_full, main.myisam_data_pointer_size_func