mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled
mysql-test/extra/binlog_tests/blackhole.test: after-merge fix, not needed in 5.1 mysql-test/extra/binlog_tests/ctype_cp932_binlog.test: after-merge fix, not needed in 5.1 mysql-test/extra/binlog_tests/ctype_ucs_binlog.test: after-merge fix, not needed in 5.1 mysql-test/extra/binlog_tests/drop_temp_table.test: after-merge fix, not needed in 5.1 mysql-test/extra/binlog_tests/insert_select-binlog.test: after-merge fix, not needed in 5.1 mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: after-merge fix, not needed in 5.1
This commit is contained in:
parent
ae0dc2e7d5
commit
7a6b827cd2
6 changed files with 1 additions and 6 deletions
|
@ -4,7 +4,6 @@
|
|||
#
|
||||
-- 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,6 +1,5 @@
|
|||
-- source include/not_embedded.inc
|
||||
-- source include/have_cp932.inc
|
||||
-- source include/have_log_bin.inc
|
||||
|
||||
--character_set cp932
|
||||
--disable_warnings
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
--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)
|
||||
|
|
|
@ -1,6 +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,6 +1,5 @@
|
|||
# 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,7 +4,7 @@
|
|||
# slave is always with --skip-innodb in the testsuite. I (Guilhem) however
|
||||
# did some tests manually on a slave; tables are replicated fine and
|
||||
# Exec_Master_Log_Pos advances as expected.
|
||||
-- source include/have_log_bin.inc
|
||||
|
||||
# Embedded server doesn't support binlogging
|
||||
-- source include/not_embedded.inc
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue