diff options
author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-10 18:01:29 +0300 |
---|---|---|
committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-04-10 18:01:29 +0300 |
commit | d66e47213d4553c76985ba5ef85b3bd8a249e5e4 (patch) | |
tree | 697ada763d2daf5afd31b470eeb2eb4f57314748 /mysql-test/lib/mtr_cases.pl | |
parent | a2989a35f51ce3481317759f23da4e663c37ac15 (diff) | |
download | mariadb-git-d66e47213d4553c76985ba5ef85b3bd8a249e5e4.tar.gz |
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.
Diffstat (limited to 'mysql-test/lib/mtr_cases.pl')
-rw-r--r-- | mysql-test/lib/mtr_cases.pl | 4 |
1 files changed, 2 insertions, 2 deletions
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], |