summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb_plugin
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-26 14:38:17 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-26 14:38:17 +0300
commitccdecaea5931e548e25c4c874a90017c98c474c3 (patch)
treee25be6d3d0531f95bd3b5002ca865674daab83eb /mysql-test/suite/innodb_plugin
parente55fb3bbe844dcc5f53ea7bdb6f13b5b79ff56ec (diff)
downloadmariadb-git-ccdecaea5931e548e25c4c874a90017c98c474c3.tar.gz
Disable call to setpriority() in pbxt. This caused mysqld to run with nice priority -19, which was far from optimal.
mysql-test/suite/innodb/r/innodb_bug60049.result: Updated results mysql-test/suite/innodb/t/innodb_bug60049.test: Force global.innodb_fast_shutdown to 0 as test require it mysql-test/suite/innodb_plugin/t/innodb_bug60049.test: Force global.innodb_fast_shutdown to 0 as test require it storage/pbxt/src/pthread_xt.cc: Disable call to setpriority()
Diffstat (limited to 'mysql-test/suite/innodb_plugin')
-rw-r--r--mysql-test/suite/innodb_plugin/r/innodb_bug60049.result1
-rw-r--r--mysql-test/suite/innodb_plugin/t/innodb_bug60049.test4
2 files changed, 5 insertions, 0 deletions
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;