database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/include/master-slave.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Merge 5.0->5.1
mysql-test/t/binlog_killed.test:
  Merge 5.0->5.1
This commit is contained in:
unknown
2007-06-07 20:27:19 +02:00
parent 53c94b71a0 4935813cd0
commit a76788e3f9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/master-slave.inc
View File

@ -1,5 +1,5 @@
# Replication tests need binlog
source include/have_binlog.inc;
source include/have_log_bin.inc;
connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);

2
mysql-test/lib/mtr_cases.pl
View File

@ -622,7 +622,7 @@ our @tags=
(
["include/have_innodb.inc", "innodb_test", 1],
["include/have_binlog_format_row.inc", "binlog_format", "row"],
["include/have_binlog.inc", "need_binlog", 1],
["include/have_log_bin.inc", "need_binlog", 1],
["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],

2
mysql-test/r/have_log_bin.require
View File

@ -1,2 +1,2 @@
Variable_name Value
have_log_bin ON
log_bin ON