Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
fb7ee691
Commit
fb7ee691
authored
May 26, 2011
by
Michael Widenius
Browse files
Options
Browse Files
Download
Plain Diff
Merge with 5.1 to get in fix wrong setpriority() call
parents
decb9c63
ccdecaea
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
+12
-5
mysql-test/suite/innodb/r/innodb_bug60049.result
mysql-test/suite/innodb/r/innodb_bug60049.result
+1
-0
mysql-test/suite/innodb/t/innodb_bug60049.test
mysql-test/suite/innodb/t/innodb_bug60049.test
+4
-5
mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
+1
-0
mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
+4
-0
storage/pbxt/src/pthread_xt.cc
storage/pbxt/src/pthread_xt.cc
+2
-0
No files found.
mysql-test/suite/innodb/r/innodb_bug60049.result
View file @
fb7ee691
set @@global.innodb_fast_shutdown=0;
CREATE TABLE t(a INT)ENGINE=InnoDB;
CREATE TABLE t(a INT)ENGINE=InnoDB;
RENAME TABLE t TO u;
RENAME TABLE t TO u;
DROP TABLE u;
DROP TABLE u;
...
...
mysql-test/suite/innodb/t/innodb_bug60049.test
View file @
fb7ee691
...
@@ -5,11 +5,10 @@
...
@@ -5,11 +5,10 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
if
(
`SELECT @@innodb_fast_shutdown != 0`
)
#
# This test will not work if we don't do full shutdown of innodb
{
#
skip
Need
innodb_fast_shutdown
=
0
;
set
@@
global
.
innodb_fast_shutdown
=
0
;
}
CREATE
TABLE
t
(
a
INT
)
ENGINE
=
InnoDB
;
CREATE
TABLE
t
(
a
INT
)
ENGINE
=
InnoDB
;
RENAME
TABLE
t
TO
u
;
RENAME
TABLE
t
TO
u
;
...
...
mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
View file @
fb7ee691
set @@global.innodb_fast_shutdown=0;
CREATE TABLE t(a INT)ENGINE=InnoDB;
CREATE TABLE t(a INT)ENGINE=InnoDB;
RENAME TABLE t TO u;
RENAME TABLE t TO u;
DROP TABLE u;
DROP TABLE u;
...
...
mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
View file @
fb7ee691
...
@@ -5,6 +5,10 @@
...
@@ -5,6 +5,10 @@
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
have_innodb_plugin
.
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
;
CREATE
TABLE
t
(
a
INT
)
ENGINE
=
InnoDB
;
RENAME
TABLE
t
TO
u
;
RENAME
TABLE
t
TO
u
;
DROP
TABLE
u
;
DROP
TABLE
u
;
...
...
storage/pbxt/src/pthread_xt.cc
View file @
fb7ee691
...
@@ -558,8 +558,10 @@ xtPublic int xt_p_set_low_priority(pthread_t thr)
...
@@ -558,8 +558,10 @@ xtPublic int xt_p_set_low_priority(pthread_t thr)
*/
*/
/* -20 = highest, 20 = lowest */
/* -20 = highest, 20 = lowest */
#ifdef SET_GLOBAL_PRIORITY
if
(
setpriority
(
PRIO_PROCESS
,
getpid
(),
20
)
==
-
1
)
if
(
setpriority
(
PRIO_PROCESS
,
getpid
(),
20
)
==
-
1
)
return
errno
;
return
errno
;
#endif
return
0
;
return
0
;
}
}
return
pth_set_priority
(
thr
,
pth_min_priority
);
return
pth_set_priority
(
thr
,
pth_min_priority
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment