From 47e6ff17f8ad023e2e721b9ff4d9eba470465a0c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Apr 2007 18:01:29 +0300 Subject: Small fixes for merge. mysql-test/include/not_embedded.inc: Fixed a typo. mysql-test/lib/mtr_cases.pl: Fixed typo and wrong error message. mysql-test/r/binlog_statement_insert_delayed.result: Fixed result file. sql/event_db_repository.cc: Fixed type. sql/log.cc: Fixed type. --- mysql-test/lib/mtr_cases.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/lib') diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index 28c78fbffeb..2c563f23e5a 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -534,7 +534,7 @@ sub collect_one_test_case($$$$$$$) { ! ( $tinfo->{'binlog_format'} eq $::used_binlog_format ) ) { $tinfo->{'skip'}= 1; - $tinfo->{'comment'}= "Not running with binlog format '$tinfo->{'binlog_format'}'"; + $tinfo->{'comment'}= "Requiring binlog format '$tinfo->{'binlog_format'}'"; return; } @@ -599,7 +599,7 @@ our @tags= ( ["include/have_innodb.inc", "innodb_test", 1], ["include/have_binlog_format_row.inc", "binlog_format", "row"], - ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"], + ["include/have_binlog_format_statement.inc", "binlog_format", "statement"], ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"], ["include/big_test.inc", "big_test", 1], ["include/have_debug.inc", "need_debug", 1], -- cgit v1.2.1