summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-02-05 08:22:27 +0100
committerunknown <mkindahl@dl145h.mysql.com>2008-02-05 08:22:27 +0100
commit57c599b3d4320f0e59751704f1c6121a4a484906 (patch)
treeb369c7cbaf827a3e4141a87c5345dd356ea6d433 /mysql-test
parent99f67290addfdeefefdf74b168ff476123f3c378 (diff)
downloadmariadb-git-57c599b3d4320f0e59751704f1c6121a4a484906.tar.gz
Disabling test case binlog_old_version for embedded server.
mysql-test/lib/mtr_report.pl: Ignoring benign error message (killing query causes unpredictable error messages). mysql-test/suite/binlog/t/binlog_old_versions.test: Disabling test case for embedded server. sql/rpl_rli.cc: Inititializing uninitialized variable causing valgrind warning.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/lib/mtr_report.pl3
-rw-r--r--mysql-test/suite/binlog/t/binlog_old_versions.test1
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index 37863ce4187..929320b7653 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -377,7 +377,8 @@ sub mtr_report_stats ($) {
# rpl_skip_error and binlog_killed_simulate produce an error which is skipped (slave does not stop)
(($testname eq 'rpl.rpl_skip_error' or
- $testname eq 'binlog.binlog_killed_simulate') and
+ $testname eq 'binlog.binlog_killed_simulate' or
+ $testname eq 'binlog.binlog_killed') and
(/Failed to write to mysql\.general_log/
)) or
diff --git a/mysql-test/suite/binlog/t/binlog_old_versions.test b/mysql-test/suite/binlog/t/binlog_old_versions.test
index 0f29030baad..2d56ebd588d 100644
--- a/mysql-test/suite/binlog/t/binlog_old_versions.test
+++ b/mysql-test/suite/binlog/t/binlog_old_versions.test
@@ -22,6 +22,7 @@
# Related bugs: BUG#27779, BUG#31581, BUG#31582, BUG#31583, BUG#32407
+source include/not_embedded.inc;
--disable_warnings
DROP TABLE IF EXISTS t1, t2, t3;