diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-05 20:04:38 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-05 20:04:38 +0300 |
| commit | dad4caa9de242ff3a8e45db05f34da46e22cad05 (patch) | |
| tree | dd9f028d4666228a8ea8b33876cc8173f68f175e /libmysqld/Makefile.am | |
| parent | f1d4c59da22e0f45a040b4c6f1d8574c413f4bf9 (diff) | |
| download | mariadb-git-dad4caa9de242ff3a8e45db05f34da46e22cad05.tar.gz | |
next-mr -> next-4284 merge.
After merge fixes.
Adjust replication test cases.
mysql-test/suite/rpl/r/rpl_mixed_row_innodb.result:
Update results with a new test.
mysql-test/suite/rpl/r/rpl_stm_loadfile.result:
Add a warning, which I believe is an expected one.
mysql-test/suite/rpl/t/rpl_killed_ddl.test:
Sort results to avoid test failurs under load.
mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result:
Update results (next-4284 merge).
mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test:
Adjust test output to the new table opening scheme: decide_logging_format() is now called in CREATE/DROP trigger.
Diffstat (limited to 'libmysqld/Makefile.am')
0 files changed, 0 insertions, 0 deletions