From 048775df13c99d52efb6d66c45f5040450c61b44 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 Aug 2007 14:12:12 -0600 Subject: [PATCH] Bug #30412 and Bug #30413 Update some tests in the "parts" suite, so they're skipped if the requisite plugins are not present in the mysqld. mysql-test/suite/parts/t/partition_char_innodb.test: Skip if mysqld doesn't include InnoDB support mysql-test/suite/parts/t/partition_datetime_innodb.test: Skip if mysqld doesn't include InnoDB support mysql-test/suite/parts/t/partition_decimal_innodb.test: Skip if mysqld doesn't include InnoDB support mysql-test/suite/parts/t/partition_float_innodb.test: Skip if mysqld doesn't include InnoDB support mysql-test/suite/parts/t/partition_int_innodb.test: Skip if mysqld doesn't include InnoDB support mysql-test/suite/parts/t/partition_special_innodb.test: Skip if mysqld doesn't include InnoDB support mysql-test/suite/parts/t/rpl_partition.test: Skip if mysqld doesn't include partition support --- mysql-test/suite/parts/t/partition_char_innodb.test | 1 + mysql-test/suite/parts/t/partition_datetime_innodb.test | 1 + mysql-test/suite/parts/t/partition_decimal_innodb.test | 2 ++ mysql-test/suite/parts/t/partition_float_innodb.test | 2 ++ mysql-test/suite/parts/t/partition_int_innodb.test | 1 + mysql-test/suite/parts/t/partition_special_innodb.test | 1 + mysql-test/suite/parts/t/rpl_partition.test | 1 + 7 files changed, 9 insertions(+) diff --git a/mysql-test/suite/parts/t/partition_char_innodb.test b/mysql-test/suite/parts/t/partition_char_innodb.test index d0389517927..27295084de4 100644 --- a/mysql-test/suite/parts/t/partition_char_innodb.test +++ b/mysql-test/suite/parts/t/partition_char_innodb.test @@ -36,6 +36,7 @@ let $debug= 0; ##### Storage engine to be tested let $engine= 'InnoDB'; +--source include/have_innodb.inc ##### max rows to be inserted let $maxrows=65535; diff --git a/mysql-test/suite/parts/t/partition_datetime_innodb.test b/mysql-test/suite/parts/t/partition_datetime_innodb.test index fe19e2803c5..eba0bc3e10b 100644 --- a/mysql-test/suite/parts/t/partition_datetime_innodb.test +++ b/mysql-test/suite/parts/t/partition_datetime_innodb.test @@ -36,6 +36,7 @@ let $debug= 0; ##### Storage engine to be tested let $engine= 'InnoDB'; +--source include/have_innodb.inc ##### max rows to be inserted let $maxrows=1024; diff --git a/mysql-test/suite/parts/t/partition_decimal_innodb.test b/mysql-test/suite/parts/t/partition_decimal_innodb.test index ec5948097c8..22e759ec5d9 100644 --- a/mysql-test/suite/parts/t/partition_decimal_innodb.test +++ b/mysql-test/suite/parts/t/partition_decimal_innodb.test @@ -36,6 +36,8 @@ let $debug= 0; ##### Storage engine to be tested let $engine= 'InnoDB'; +--source include/have_innodb.inc + ##### number of rows to be inserted let $maxrows=1024; diff --git a/mysql-test/suite/parts/t/partition_float_innodb.test b/mysql-test/suite/parts/t/partition_float_innodb.test index b36dc0668a6..3395d1812d2 100644 --- a/mysql-test/suite/parts/t/partition_float_innodb.test +++ b/mysql-test/suite/parts/t/partition_float_innodb.test @@ -36,6 +36,8 @@ let $debug= 0; ##### Storage engine to be tested let $engine= 'InnoDB'; +--source include/have_innodb.inc + ##### Number of row to be inserted. let $maxrows=1024; diff --git a/mysql-test/suite/parts/t/partition_int_innodb.test b/mysql-test/suite/parts/t/partition_int_innodb.test index fda7398565c..dc14b369654 100644 --- a/mysql-test/suite/parts/t/partition_int_innodb.test +++ b/mysql-test/suite/parts/t/partition_int_innodb.test @@ -36,6 +36,7 @@ let $debug= 0; ##### Storage engine to be tested let $engine= 'InnoDB'; +--source include/have_innodb.inc ##### max rows to be inserted let $maxrows=1024; diff --git a/mysql-test/suite/parts/t/partition_special_innodb.test b/mysql-test/suite/parts/t/partition_special_innodb.test index 5df518a3952..f552d64f4e4 100644 --- a/mysql-test/suite/parts/t/partition_special_innodb.test +++ b/mysql-test/suite/parts/t/partition_special_innodb.test @@ -36,6 +36,7 @@ let $debug= 0; ##### Storage engine to be tested let $engine= 'InnoDB'; +--source include/have_innodb.inc #------------------------------------------------------------------------------# # Execute the tests to be applied to all storage engines diff --git a/mysql-test/suite/parts/t/rpl_partition.test b/mysql-test/suite/parts/t/rpl_partition.test index ffd6d17ec6f..f1002ded81f 100644 --- a/mysql-test/suite/parts/t/rpl_partition.test +++ b/mysql-test/suite/parts/t/rpl_partition.test @@ -1,3 +1,4 @@ +--source include/have_partition.inc --source include/have_innodb.inc --source include/master-slave.inc