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
fd30d07f
Commit
fd30d07f
authored
Oct 23, 2016
by
sensssz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style fixes.
parent
149581a6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
14 deletions
+13
-14
sql/rpl_parallel.cc
sql/rpl_parallel.cc
+1
-1
storage/innobase/include/trx0trx.h
storage/innobase/include/trx0trx.h
+2
-2
storage/innobase/lock/lock0lock.cc
storage/innobase/lock/lock0lock.cc
+10
-11
No files found.
sql/rpl_parallel.cc
View file @
fd30d07f
...
...
@@ -1410,7 +1410,7 @@ handle_rpl_parallel_thread(void *arg)
mysql_mutex_unlock
(
&
rpt
->
LOCK_rpl_thread
);
my_thread_end
();
return
NULL
;
}
...
...
storage/innobase/include/trx0trx.h
View file @
fd30d07f
...
...
@@ -1096,8 +1096,8 @@ struct trx_t {
time_t
start_time
;
/*!< time the state last time became
TRX_STATE_ACTIVE */
clock_t
start_time_micro
;
/*!< start time of the transaction
in microseconds. */
clock_t
start_time_micro
;
/*!< start time of the transaction
in microseconds. */
lsn_t
commit_lsn
;
/*!< lsn at the time of the commit */
table_id_t
table_id
;
/*!< Table to drop iff dict_operation
== TRX_DICT_OP_TABLE, or 0. */
...
...
storage/innobase/lock/lock0lock.cc
View file @
fd30d07f
...
...
@@ -53,7 +53,6 @@ Created 5/7/1996 Heikki Tuuri
#include "row0mysql.h"
#include "pars0pars.h"
#include <inttypes.h>
#include <set>
#ifdef WITH_WSREP
...
...
@@ -1756,11 +1755,11 @@ has_higher_priority(
return
true
;
}
if
(
trx_is_high_priority
(
lock1
->
trx
))
{
return
true
;
}
if
(
trx_is_high_priority
(
lock2
->
trx
))
{
return
false
;
}
return
true
;
}
if
(
trx_is_high_priority
(
lock2
->
trx
))
{
return
false
;
}
// No preference. Compre them by wait mode and trx age.
if
(
!
lock_get_wait
(
lock1
))
{
return
true
;
...
...
@@ -1780,11 +1779,11 @@ static
dberr_t
lock_rec_insert_by_trx_age
(
lock_t
*
in_lock
)
/*!< in: lock to be insert */
{
ulint
space
;
ulint
page_no
;
ulint
space
;
ulint
page_no
;
ulint
rec_fold
;
hash_table_t
*
hash
;
hash_cell_t
*
cell
;
hash_table_t
*
hash
;
hash_cell_t
*
cell
;
lock_t
*
node
;
lock_t
*
next
;
...
...
@@ -5197,7 +5196,7 @@ lock_release(
ut_d
(
lock_check_dict_lock
(
lock
));
if
(
lock_get_type_low
(
lock
)
==
LOCK_REC
)
{
lock_rec_dequeue_from_page
(
lock
);
}
else
{
dict_table_t
*
table
;
...
...
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