1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pilot.(none):/data/msvensson/mysql/bug28369/my50-bug28369

Browse Source 
into  pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369
This commit is contained in:
msvensson@pilot.(none) 2007-06-07 19:19:29 +02:00
commit ad2419050e
18 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/extra/binlog_tests/binlog.test
View File

@ -4,6 +4,7 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
-- source include/have_log_bin.inc
-- source include/have_debug.inc
--disable_warnings

1
mysql-test/extra/binlog_tests/blackhole.test
View File

@ -4,6 +4,7 @@
#
-- source include/not_embedded.inc
-- source include/have_blackhole.inc
-- source include/have_log_bin.inc
--disable_warnings
drop table if exists t1,t2;

1
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test
View File

@ -1,5 +1,6 @@
-- source include/not_embedded.inc
-- source include/have_cp932.inc
-- source include/have_log_bin.inc
--character_set cp932
--disable_warnings

1
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test
View File

@ -1,5 +1,6 @@
--source include/not_embedded.inc
--source include/have_ucs2.inc
--source include/have_log_bin.inc
#
# Check correct binlogging of UCS2 user variables (BUG#3875)

4
mysql-test/extra/binlog_tests/drop_temp_table.test
View File

@ -1,5 +1,5 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
--source include/have_log_bin.inc
--disable_warnings
drop database if exists `drop-temp+table-test`;

1
mysql-test/extra/binlog_tests/insert_select-binlog.test
View File

@ -1,5 +1,6 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
--disable_warnings
drop table if exists t1,t2;

4
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
View File

@ -5,9 +5,7 @@
# did some tests manually on a slave; tables are replicated fine and
# Exec_Master_Log_Pos advances as expected.
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
-- source include/have_innodb.inc
-- source include/have_debug.inc

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

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

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

@ -596,6 +596,22 @@ sub collect_one_test_case($$$$$$$) {
}
}
if ( $tinfo->{'need_binlog'} )
{
if (grep(/^--skip-log-bin/, @::opt_extra_mysqld_opt) )
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test need binlog";
return;
}
}
else
{
# Test does not need binlog, add --skip-binlog to
# the options used when starting it
push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
}
}
}
@ -606,6 +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_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/t/flush_block_commit_notembedded.test
View File

@ -4,7 +4,7 @@
# This is intended to mimick how mysqldump and innobackup work.
# And it requires InnoDB
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
-- source include/have_innodb.inc
connect (con1,localhost,root,,);

1
mysql-test/t/innodb.test
View File

@ -13,6 +13,7 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
-- source include/have_log_bin.inc
#
# Small basic test with ignore

1
mysql-test/t/mysqlbinlog-cp932.test
View File

@ -3,6 +3,7 @@
-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/have_cp932.inc
-- source include/have_log_bin.inc
# Bug#16217 (mysql client did not know how not switch its internal charset)
flush logs;

3
mysql-test/t/mysqlbinlog.test
View File

@ -2,8 +2,7 @@
# TODO: Need to look at making a row based version once the new row based client is completed. [jbm]
-- source include/have_binlog_format_mixed_or_statement.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
-- source include/have_log_bin.inc
# we need this for getting fixed timestamps inside of this test
set timestamp=1000000000;

2
mysql-test/t/mysqlbinlog2.test
View File

@ -4,8 +4,6 @@
# TODO: Need to look at making row based version once new binlog client is complete.
-- source include/have_binlog_format_mixed_or_statement.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
--disable_warnings
drop table if exists t1;

1
mysql-test/t/mysqldump.test
View File

@ -1,5 +1,6 @@
# Embedded server doesn't support external clients
--source include/not_embedded.inc
--source include/have_log_bin.inc
--disable_warnings
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;

1
mysql-test/t/rpl_000015.test
View File

@ -1,3 +1,4 @@
-- source include/have_log_bin.inc
#####################
# Change Author: JBM
# Change Date: 2006-01-17

2
mysql-test/t/rpl_rotate_logs.test
View File

@ -1,6 +1,8 @@
# This test uses chmod, can't be run with root permissions
-- source include/not_as_root.inc
-- source include/have_log_bin.inc
#
# Test is run with max_binlog_size=2048 to force automatic rotation of the
# binary log

2
mysql-test/t/user_var-binlog.test
View File

@ -1,8 +1,6 @@
# Requires statement logging
-- source include/have_binlog_format_mixed_or_statement.inc
# TODO: Create row based version once $MYSQL_BINLOG has new RB version
# Embedded server does not support binlogging
--source include/not_embedded.inc
# Check that user variables are binlogged correctly (BUG#3875)
create table t1 (a varchar(50));