Skip to content

Commit fd30d07

Browse files
committed
Style fixes.
1 parent 149581a commit fd30d07

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

sql/rpl_parallel.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ handle_rpl_parallel_thread(void *arg)
14101410
mysql_mutex_unlock(&rpt->LOCK_rpl_thread);
14111411

14121412
my_thread_end();
1413-
1413+
14141414
return NULL;
14151415
}
14161416

storage/innobase/include/trx0trx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,8 @@ struct trx_t {
10961096

10971097
time_t start_time; /*!< time the state last time became
10981098
TRX_STATE_ACTIVE */
1099-
clock_t start_time_micro; /*!< start time of the transaction
1100-
in microseconds. */
1099+
clock_t start_time_micro; /*!< start time of the transaction
1100+
in microseconds. */
11011101
lsn_t commit_lsn; /*!< lsn at the time of the commit */
11021102
table_id_t table_id; /*!< Table to drop iff dict_operation
11031103
== TRX_DICT_OP_TABLE, or 0. */

storage/innobase/lock/lock0lock.cc

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ Created 5/7/1996 Heikki Tuuri
5353
#include "row0mysql.h"
5454
#include "pars0pars.h"
5555

56-
#include <inttypes.h>
5756
#include <set>
5857

5958
#ifdef WITH_WSREP
@@ -1756,11 +1755,11 @@ has_higher_priority(
17561755
return true;
17571756
}
17581757
if (trx_is_high_priority(lock1->trx)) {
1759-
return true;
1760-
}
1761-
if (trx_is_high_priority(lock2->trx)) {
1762-
return false;
1763-
}
1758+
return true;
1759+
}
1760+
if (trx_is_high_priority(lock2->trx)) {
1761+
return false;
1762+
}
17641763
// No preference. Compre them by wait mode and trx age.
17651764
if (!lock_get_wait(lock1)) {
17661765
return true;
@@ -1780,11 +1779,11 @@ static
17801779
dberr_t
17811780
lock_rec_insert_by_trx_age(
17821781
lock_t *in_lock) /*!< in: lock to be insert */{
1783-
ulint space;
1784-
ulint page_no;
1782+
ulint space;
1783+
ulint page_no;
17851784
ulint rec_fold;
1786-
hash_table_t* hash;
1787-
hash_cell_t* cell;
1785+
hash_table_t* hash;
1786+
hash_cell_t* cell;
17881787
lock_t* node;
17891788
lock_t* next;
17901789

@@ -5197,7 +5196,7 @@ lock_release(
51975196
ut_d(lock_check_dict_lock(lock));
51985197

51995198
if (lock_get_type_low(lock) == LOCK_REC) {
5200-
5199+
52015200
lock_rec_dequeue_from_page(lock);
52025201
} else {
52035202
dict_table_t* table;

0 commit comments

Comments
 (0)