diff options
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_bug60049.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug60049.test | 9 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/r/innodb_bug60049.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb_bug60049.test | 4 | ||||
| -rwxr-xr-x | storage/pbxt/src/pthread_xt.cc | 2 |
5 files changed, 12 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; diff --git a/storage/pbxt/src/pthread_xt.cc b/storage/pbxt/src/pthread_xt.cc index e7f0632e9ae..c5dc2e41fdd 100755 --- a/storage/pbxt/src/pthread_xt.cc +++ b/storage/pbxt/src/pthread_xt.cc @@ -558,8 +558,10 @@ xtPublic int xt_p_set_low_priority(pthread_t thr) */ /* -20 = highest, 20 = lowest */ +#ifdef SET_GLOBAL_PRIORITY if (setpriority(PRIO_PROCESS, getpid(), 20) == -1) return errno; +#endif return 0; } return pth_set_priority(thr, pth_min_priority); |