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 | |
| 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')
| -rw-r--r-- | mysql-test/include/not_embedded.inc | 2 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_cases.pl | 4 | ||||
| -rw-r--r-- | mysql-test/r/binlog_statement_insert_delayed.result | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/include/not_embedded.inc b/mysql-test/include/not_embedded.inc index fcc1756caab..360f268ad4f 100644 --- a/mysql-test/include/not_embedded.inc +++ b/mysql-test/include/not_embedded.inc @@ -1,5 +1,5 @@ -- require r/not_embedded.require disable_query_log; -select version() like N'%embedded%' as 'have_embedded'; +select version() like '%embedded%' as 'have_embedded'; enable_query_log; 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], diff --git a/mysql-test/r/binlog_statement_insert_delayed.result b/mysql-test/r/binlog_statement_insert_delayed.result index 7a1b9a7ec9b..3a2dc441632 100644 --- a/mysql-test/r/binlog_statement_insert_delayed.result +++ b/mysql-test/r/binlog_statement_insert_delayed.result @@ -3,13 +3,13 @@ set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1; insert delayed into t1 values (207); insert delayed into t1 values (null); insert delayed into t1 values (300); -show binlog events from 102; +show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam -master-bin.000001 # Query 1 # use `test`; insert delayed into t1 values (207) -master-bin.000001 # Intvar 1 # INSERT_ID=208 -master-bin.000001 # Query 1 # use `test`; insert delayed into t1 values (null) -master-bin.000001 # Query 1 # use `test`; insert delayed into t1 values (300) +master-bin.000001 # Query # # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam +master-bin.000001 # Query # # use `test`; insert delayed into t1 values (207) +master-bin.000001 # Intvar # # INSERT_ID=208 +master-bin.000001 # Query # # use `test`; insert delayed into t1 values (null) +master-bin.000001 # Query # # use `test`; insert delayed into t1 values (300) insert delayed into t1 values (null),(null),(null),(null); insert delayed into t1 values (null),(null),(400),(null); 11 == 11 |