summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
authorunknown <df@pippilotta.erinye.com>2007-04-25 21:33:18 +0200
committerunknown <df@pippilotta.erinye.com>2007-04-25 21:33:18 +0200
commitfedd09cddf83799713f77bcab000069478f5e540 (patch)
tree67602f4c695e48eac9c95d189fd254bcb1a0303d /mysql-test/extra
parent42768e957baf4812cb8852d200abb9635a0f1cc0 (diff)
downloadmariadb-git-fedd09cddf83799713f77bcab000069478f5e540.tar.gz
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: 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.
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test3
1 files changed, 3 insertions, 0 deletions
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