From b353df747403d1d18142ebcb9ea582760d86baff Mon Sep 17 00:00:00 2001
From: "df@pippilotta.erinye.com" <>
Date: Wed, 25 Apr 2007 21:33:18 +0200
Subject: [PATCH] Fix test case that was broken for builds without InnoDB. ---
 Merge
 pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
 into 
 pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
 --- Fix test cases to pass for a plain ./configure && make build. This
 includes disabling two test cases when certain features are not present in
 the server. We're not losing coverage from this because these features are
 usually present, and disabling them here only serves the purpose to make the
 test cases work in the unlikely case that they aren't. --- fixes

---
 mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test | 3 +++
 mysql-test/t/rpl_row_basic_11bugs.test             | 4 +++-
 mysql-test/t/rpl_row_mysqlbinlog.test              | 2 ++
 mysql-test/t/sp.test                               | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
index 34e01b7a675..a8a3e33b8cd 100644
--- a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
+++ b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
@@ -4,6 +4,9 @@
 # Purpose: To test having extra columns on the slave.
 ##################################################
 
+# Some tests in here requre partitioning
+-- source include/have_partition.inc
+
 ########### Clean up ################
 --disable_warnings
 --disable_query_log
diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test
index 17f5848ceef..0109edf4264 100644
--- a/mysql-test/t/rpl_row_basic_11bugs.test
+++ b/mysql-test/t/rpl_row_basic_11bugs.test
@@ -1,6 +1,5 @@
 --source include/have_binlog_format_row.inc
 
-
 let $SERVER_VERSION=`select version()`;
 
 #This test case is not written for NDB, the result files 
@@ -127,6 +126,8 @@ sync_slave_with_master;
 --source include/master-slave-reset.inc
 --enable_query_log
 
+# disabling warnings temporarily for ENGINE=INNODB to work without InnoDB
+--disable_warnings
 --echo **** On Master **** 
 connection master;
 CREATE TABLE t1_myisam (k INT, a BIT(1), b BIT(9)) ENGINE=MYISAM;
@@ -139,6 +140,7 @@ ALTER TABLE t1_myisam ENGINE=INNODB;
 ALTER TABLE t1_innodb ENGINE=MYISAM;
 ALTER TABLE t2_myisam ENGINE=INNODB;
 ALTER TABLE t2_innodb ENGINE=MYISAM;
+--enable_warnings
 
 --echo **** On Master **** 
 connection master;
diff --git a/mysql-test/t/rpl_row_mysqlbinlog.test b/mysql-test/t/rpl_row_mysqlbinlog.test
index f7158107e4c..1a5dd281ae1 100644
--- a/mysql-test/t/rpl_row_mysqlbinlog.test
+++ b/mysql-test/t/rpl_row_mysqlbinlog.test
@@ -10,6 +10,8 @@
 # Embedded server doesn't support binlogging
 -- source include/not_embedded.inc
 -- source include/master-slave.inc
+# This test requires the cp932 charset compiled in
+-- source include/have_cp932.inc
 
 # Setup Section
 # we need this for getting fixed timestamps inside of this test
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 626a963e340..a9ef5ba8ea7 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -7167,8 +7167,11 @@ DROP FUNCTION bug5274_f2|
 delimiter ;|
 drop table t1,t2;
 
+# Disable warnings to allow test run without InnoDB
+--disable_warnings
 CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;
 CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;
+--enable_warnings
 set @a=0;
 
 delimiter |;
-- 
2.30.9