bk commit into 5.1 tree (df:1.2584)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-25 20:58:03+02:00, df@stripped +3 -0
  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.

  mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test@stripped, 2007-04-25 20:58:01+02:00, df@stripped +3 -0
    Disable this test case if we don't have partitioning

  mysql-test/t/rpl_row_basic_11bugs.test@stripped, 2007-04-25 20:58:01+02:00, df@stripped +9 -1
    Disable warnings in a number of places to make this test case work with servers that don't contain InnoDB

  mysql-test/t/rpl_row_mysqlbinlog.test@stripped, 2007-04-25 20:58:01+02:00, df@stripped +2 -0
    Disable this test case if the server does not have cp932 compiled in

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building

--- 1.1/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2006-11-03 15:03:40 +01:00
+++ 1.2/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2007-04-25 20:58:01 +02:00
@@ -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

--- 1.4/mysql-test/t/rpl_row_mysqlbinlog.test	2007-03-29 21:37:59 +02:00
+++ 1.5/mysql-test/t/rpl_row_mysqlbinlog.test	2007-04-25 20:58:01 +02:00
@@ -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

--- 1.14/mysql-test/t/rpl_row_basic_11bugs.test	2007-03-29 21:37:59 +02:00
+++ 1.15/mysql-test/t/rpl_row_basic_11bugs.test	2007-04-25 20:58:01 +02:00
@@ -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,17 +126,26 @@
 --source include/master-slave-reset.inc
 --enable_query_log
 
+# disabling warnings temporarily for ENGINE=INNODB to work without InnoDB
 --echo **** On Master **** 
 connection master;
 CREATE TABLE t1_myisam (k INT, a BIT(1), b BIT(9)) ENGINE=MYISAM;
+--disable_warnings
 CREATE TABLE t1_innodb (k INT, a BIT(1), b BIT(9)) ENGINE=INNODB;
+--enable_warnings
 CREATE TABLE t2_myisam (k INT, a BIT(1) NOT NULL, b BIT(4) NOT NULL) ENGINE=MYISAM;
+--disable_warnings
 CREATE TABLE t2_innodb (k INT, a BIT(1) NOT NULL, b BIT(4) NOT NULL) ENGINE=INNODB;
+--enable_warnings
 --echo **** On Slave **** 
 sync_slave_with_master;
+--disable_warnings
 ALTER TABLE t1_myisam ENGINE=INNODB;
+--enable_warnings
 ALTER TABLE t1_innodb ENGINE=MYISAM;
+--disable_warnings
 ALTER TABLE t2_myisam ENGINE=INNODB;
+--enable_warnings
 ALTER TABLE t2_innodb ENGINE=MYISAM;
 
 --echo **** On Master ****