Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn


mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
mysql-test/t/user_var-binlog.test:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  needs no change in 5.1 as it is in a separate folder
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  needs regeneration
mysql-test/t/mysqlbinlog-cp932.test:
  needs no change because already has dependency on binlog format
mysql-test/t/mysqlbinlog2.test:
  needs no change because already has dependency on binlog format

5 files changed, 8 insertions, 0 deletions

diff --git a/mysql-test/t/flush_block_commit_notembedded.test b/mysql-test/t/flush_block_commit_notembedded.test
index 4650a5a15a8..25eb093226e 100644
--- a/mysql-test/t/flush_block_commit_notembedded.test
+++ b/mysql-test/t/flush_block_commit_notembedded.test
@@ -3,6 +3,8 @@
 # We verify that we did not introduce a deadlock.
 # This is intended to mimick how mysqldump and innobackup work.
 
+-- source include/have_log_bin.inc
+
 # And it requires InnoDB
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index e4cbd2938fb..f4785baa9db 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -2,6 +2,8 @@
 # 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
 
+-- source include/have_log_bin.inc
+
 # Embedded server doesn't support binlogging
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 057432d37fd..7d254372eab 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -1,3 +1,5 @@
+-- source include/have_log_bin.inc
+
 # This test should work in embedded server after mysqltest is fixed
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/sp_trans.test b/mysql-test/t/sp_trans.test
index a79f6c7e7e0..bd5e6e33cf7 100644
--- a/mysql-test/t/sp_trans.test
+++ b/mysql-test/t/sp_trans.test
@@ -2,6 +2,7 @@
 # tests that require InnoDB...
 #
 
+-- source include/have_log_bin.inc
 -- source include/have_innodb.inc
 
 --disable_warnings
diff --git a/mysql-test/t/user_var-binlog.test b/mysql-test/t/user_var-binlog.test
index 3ce01a0927b..fc534cc357a 100644
--- a/mysql-test/t/user_var-binlog.test
+++ b/mysql-test/t/user_var-binlog.test
@@ -3,6 +3,7 @@
 # TODO: Create row based version once $MYSQL_BINLOG has new RB version
 # Embedded server does not support binlogging
 --source include/not_embedded.inc
+--source include/have_log_bin.inc
 
 # Check that user variables are binlogged correctly (BUG#3875)
 create table t1 (a varchar(50));