Automatic merge

mysql-test/suite/innodb/r/innodb_bug60049.result

+set @@global.innodb_fast_shutdown=0;
 CREATE TABLE t(a INT)ENGINE=InnoDB;
 RENAME TABLE t TO u;
 DROP TABLE u;

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;

mysql-test/suite/innodb_plugin/r/innodb_bug60049.result

+set @@global.innodb_fast_shutdown=0;
 CREATE TABLE t(a INT)ENGINE=InnoDB;
 RENAME TABLE t TO u;
 DROP TABLE u;

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;

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);