1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatic merge

Browse Source
This commit is contained in:
Michael Widenius 2011-05-26 18:34:22 +03:00
commit e2962ee07e
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/innodb/r/innodb_bug60049.result
View File

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

9
mysql-test/suite/innodb/t/innodb_bug60049.test
View File

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

1
mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
View File

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

4
mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
View File

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

2
storage/pbxt/src/pthread_xt.cc
View File

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