diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-26 18:07:06 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-26 18:07:06 +0300 |
| commit | fb7ee69128efb829dc1c795359573cabf1710ebc (patch) | |
| tree | cb065cddecdbde4fd92de331c564b20bfe07e3a5 /mysql-test | |
| parent | decb9c639ae4db36650996112c9d1200eb5d575d (diff) | |
| parent | ccdecaea5931e548e25c4c874a90017c98c474c3 (diff) | |
| download | mariadb-git-fb7ee69128efb829dc1c795359573cabf1710ebc.tar.gz | |
Merge with 5.1 to get in fix wrong setpriority() call
Diffstat (limited to 'mysql-test')
4 files changed, 10 insertions, 5 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_bug60049.result b/mysql-test/suite/innodb/r/innodb_bug60049.result index bec0e05a897..a1788a8ab0a 100644 --- a/mysql-test/suite/innodb/r/innodb_bug60049.result +++ b/mysql-test/suite/innodb/r/innodb_bug60049.result @@ -1,3 +1,4 @@ +set @@global.innodb_fast_shutdown=0; CREATE TABLE t(a INT)ENGINE=InnoDB; RENAME TABLE t TO u; DROP TABLE u; diff --git a/mysql-test/suite/innodb/t/innodb_bug60049.test b/mysql-test/suite/innodb/t/innodb_bug60049.test index 1110f619862..fc977b3976f 100644 --- a/mysql-test/suite/innodb/t/innodb_bug60049.test +++ b/mysql-test/suite/innodb/t/innodb_bug60049.test @@ -5,11 +5,10 @@ -- source include/not_embedded.inc -- source include/have_innodb.inc -if (`SELECT @@innodb_fast_shutdown != 0`) - -{ - skip Need innodb_fast_shutdown=0; -} +# +# This test will not work if we don't do full shutdown of innodb +# +set @@global.innodb_fast_shutdown=0; CREATE TABLE t(a INT)ENGINE=InnoDB; RENAME TABLE t TO u; diff --git a/mysql-test/suite/innodb_plugin/r/innodb_bug60049.result b/mysql-test/suite/innodb_plugin/r/innodb_bug60049.result index bec0e05a897..a1788a8ab0a 100644 --- a/mysql-test/suite/innodb_plugin/r/innodb_bug60049.result +++ b/mysql-test/suite/innodb_plugin/r/innodb_bug60049.result @@ -1,3 +1,4 @@ +set @@global.innodb_fast_shutdown=0; CREATE TABLE t(a INT)ENGINE=InnoDB; RENAME TABLE t TO u; DROP TABLE u; diff --git a/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test b/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test index 0423f5d3635..f42451d2994 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test @@ -5,6 +5,10 @@ -- source include/not_embedded.inc -- source include/have_innodb_plugin.inc +# This test will not work if we don't do full shutdown of innodb +# +set @@global.innodb_fast_shutdown=0; + CREATE TABLE t(a INT)ENGINE=InnoDB; RENAME TABLE t TO u; DROP TABLE u; |