Alexander Nozdrin ddc8765a9e Manual merge from mysql-trunk-merge. ...

Conflicts:
  - mysql-test/suite/rpl/r/rpl_binlog_grant.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - mysql-test/suite/rpl/t/rpl_binlog_grant.test
  - sql/sql_parse.cc
  - sql/sql_table.cc
  - sql/sql_test.cc

2010-01-31 01:06:50 +03:00

..

My

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

incompatible.tests

Bug #45698 MTR_VERSION=1 ./mtr --force does not work

2009-07-16 14:05:46 +02:00

mtr_cases.pl

Bug #45698 MTR_VERSION=1 ./mtr --force does not work

2009-07-31 11:22:57 +02:00

mtr_gcov.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_gprof.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_im.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_io.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_match.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_misc.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_process.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_report.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_stress.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_timer.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mtr_unique.pl

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

mysql-test-run.pl

Manual merge from mysql-trunk-merge.

2010-01-31 01:06:50 +03:00

ndb_config_1_node.ini

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00

ndb_config_2_node.ini

WL#4189 Add full backward compatibility to mysql-test-run.pl

2008-11-14 09:45:32 +01:00