From a633c45592338fa193df7cb89e2fc774a1ed48c2 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Fri, 9 Apr 2010 16:38:28 +0300 Subject: [PATCH] Convert InnoDB Plugin tests to include have_innodb_plugin.inc. This also instructs mtr to transparently load the plugin. --- mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test | 4 ++-- mysql-test/suite/innodb_plugin/t/innodb_bug44369.test | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug46000.test | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug46676.test | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug47167.test | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug47621.test | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug47622.test | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug47777.test | 2 +- mysql-test/suite/innodb_plugin/t/innodb_bug51378.test | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test b/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test index 325dd19d086..bc042587287 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test +++ b/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test @@ -1,4 +1,4 @@ ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc #display current value of innodb_use_sys_malloc SELECT @@GLOBAL.innodb_use_sys_malloc; @@ -22,7 +22,7 @@ create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1; insert into t1 values (1),(2),(3),(4),(5),(6),(7); select * from t1; drop table t1; ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc #display current value of innodb_use_sys_malloc SELECT @@GLOBAL.innodb_use_sys_malloc; diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug44369.test b/mysql-test/suite/innodb_plugin/t/innodb_bug44369.test index f5d85cd5815..d01694c3797 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug44369.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug44369.test @@ -3,7 +3,7 @@ # some innodb internal reserved key words, # both case sensitively and insensitely. ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc # This create table operation should fail. --error ER_WRONG_COLUMN_NAME diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test b/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test index 5a3c666326e..acc027c20e7 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test @@ -3,7 +3,7 @@ # "GEN_CLUST_INDEX", which is the reserved # name for innodb default primary index. ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc # This 'create table' operation should fail because of # using the reserve name as its index name. diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test b/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test index 440666c4226..7e3ecfe715a 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test @@ -2,7 +2,7 @@ # It is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37. # But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5). ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc SET foreign_key_checks=0; CREATE TABLE t1 (id int, foreign key (id) references t2(id)) ENGINE=INNODB; diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test index 88e927c01bd..e8499bb14dd 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test @@ -3,7 +3,7 @@ # "innodb_file_format_check" with a # user-Defined Variable. ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc # Save the value (Antelope) in 'innodb_file_format_check' to # 'old_innodb_file_format_check' diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test index 4863cc6bba1..0305484c351 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test @@ -2,7 +2,7 @@ # not result in column definition inconsistency between MySQL and # InnoDB ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc CREATE TABLE bug47621 (salesperson INT) ENGINE=InnoDB; diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test index 9cf9d0e531b..ec544bd7962 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test @@ -4,7 +4,7 @@ # We resolve the problem by sync the index sequence # up when opening the table. ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc connect (a,localhost,root,,); connect (b,localhost,root,,); diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test index 8f2985b2cf0..4ea9841bf28 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test @@ -4,7 +4,7 @@ # should follow the process for the BLOB # datatype as well. ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc create table bug47777(c2 linestring not null, primary key (c2(1))) engine=innodb; diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test b/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test index 8f7b0b9605a..2d0d84807bb 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test @@ -9,7 +9,7 @@ # will be created as primary index # Following queries test various scenario, no mismatch # error message should be printed. ---source include/have_innodb.inc +-- source include/have_innodb_plugin.inc # Create a table contains a BLOB column create table bug51378 (