Commit fedd09cd authored by unknown's avatar unknown

Fix test case that was broken for builds without InnoDB.

```yaml
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:
  Disable this test case if we don't have partitioning
mysql-test/t/rpl_row_basic_11bugs.test:
  Disable warnings in a number of places to make this test case work with servers that don't contain InnoDB
  ---
  make test case look better on request from reviewer
mysql-test/t/rpl_row_mysqlbinlog.test:
  Disable this test case if the server does not have cp932 compiled in
mysql-test/t/sp.test:
  Disable warnings during table creation in one place where engine=innodb is used, in order to make this test case work with a mysqld that was compiled without InnoDB.
parent 42768e95
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
# Purpose: To test having extra columns on the slave. # Purpose: To test having extra columns on the slave.
################################################## ##################################################
# Some tests in here requre partitioning
-- source include/have_partition.inc
########### Clean up ################ ########### Clean up ################
--disable_warnings --disable_warnings
--disable_query_log --disable_query_log
......
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
let $SERVER_VERSION=`select version()`; let $SERVER_VERSION=`select version()`;
#This test case is not written for NDB, the result files #This test case is not written for NDB, the result files
...@@ -127,6 +126,8 @@ sync_slave_with_master; ...@@ -127,6 +126,8 @@ sync_slave_with_master;
--source include/master-slave-reset.inc --source include/master-slave-reset.inc
--enable_query_log --enable_query_log
# disabling warnings temporarily for ENGINE=INNODB to work without InnoDB
--disable_warnings
--echo **** On Master **** --echo **** On Master ****
connection master; connection master;
CREATE TABLE t1_myisam (k INT, a BIT(1), b BIT(9)) ENGINE=MYISAM; CREATE TABLE t1_myisam (k INT, a BIT(1), b BIT(9)) ENGINE=MYISAM;
...@@ -139,6 +140,7 @@ ALTER TABLE t1_myisam ENGINE=INNODB; ...@@ -139,6 +140,7 @@ ALTER TABLE t1_myisam ENGINE=INNODB;
ALTER TABLE t1_innodb ENGINE=MYISAM; ALTER TABLE t1_innodb ENGINE=MYISAM;
ALTER TABLE t2_myisam ENGINE=INNODB; ALTER TABLE t2_myisam ENGINE=INNODB;
ALTER TABLE t2_innodb ENGINE=MYISAM; ALTER TABLE t2_innodb ENGINE=MYISAM;
--enable_warnings
--echo **** On Master **** --echo **** On Master ****
connection master; connection master;
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
# Embedded server doesn't support binlogging # Embedded server doesn't support binlogging
-- source include/not_embedded.inc -- source include/not_embedded.inc
-- source include/master-slave.inc -- source include/master-slave.inc
# This test requires the cp932 charset compiled in
-- source include/have_cp932.inc
# Setup Section # Setup Section
# we need this for getting fixed timestamps inside of this test # we need this for getting fixed timestamps inside of this test
......
...@@ -7167,8 +7167,11 @@ DROP FUNCTION bug5274_f2| ...@@ -7167,8 +7167,11 @@ DROP FUNCTION bug5274_f2|
delimiter ;| delimiter ;|
drop table t1,t2; 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 t1 (a int auto_increment primary key) engine=MyISAM;
CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb; CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;
--enable_warnings
set @a=0; set @a=0;
delimiter |; delimiter |;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment