after-merge fixes: test cases that were moved to extra/binlog_tests do not...

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

mysql-test/extra/binlog_tests/blackhole.test

@@ -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;

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

 -- source include/not_embedded.inc
 -- source include/have_cp932.inc
--- source include/have_log_bin.inc
 
 --character_set cp932
 --disable_warnings

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

 --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)

mysql-test/extra/binlog_tests/drop_temp_table.test

 # 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`;

mysql-test/extra/binlog_tests/insert_select-binlog.test

 # 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;

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

@@ -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