File tree Expand file tree Collapse file tree 3 files changed +13
-14
lines changed Expand file tree Collapse file tree 3 files changed +13
-14
lines changed Original file line number Diff line number Diff line change @@ -1410,7 +1410,7 @@ handle_rpl_parallel_thread(void *arg)
1410
1410
mysql_mutex_unlock (&rpt->LOCK_rpl_thread );
1411
1411
1412
1412
my_thread_end ();
1413
-
1413
+
1414
1414
return NULL ;
1415
1415
}
1416
1416
Original file line number Diff line number Diff line change @@ -1096,8 +1096,8 @@ struct trx_t {
1096
1096
1097
1097
time_t start_time; /* !< time the state last time became
1098
1098
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. */
1101
1101
lsn_t commit_lsn; /* !< lsn at the time of the commit */
1102
1102
table_id_t table_id; /* !< Table to drop iff dict_operation
1103
1103
== TRX_DICT_OP_TABLE, or 0. */
Original file line number Diff line number Diff line change @@ -53,7 +53,6 @@ Created 5/7/1996 Heikki Tuuri
53
53
#include " row0mysql.h"
54
54
#include " pars0pars.h"
55
55
56
- #include < inttypes.h>
57
56
#include < set>
58
57
59
58
#ifdef WITH_WSREP
@@ -1756,11 +1755,11 @@ has_higher_priority(
1756
1755
return true ;
1757
1756
}
1758
1757
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
+ }
1764
1763
// No preference. Compre them by wait mode and trx age.
1765
1764
if (!lock_get_wait (lock1)) {
1766
1765
return true ;
@@ -1780,11 +1779,11 @@ static
1780
1779
dberr_t
1781
1780
lock_rec_insert_by_trx_age (
1782
1781
lock_t *in_lock) /* !< in: lock to be insert */ {
1783
- ulint space;
1784
- ulint page_no;
1782
+ ulint space;
1783
+ ulint page_no;
1785
1784
ulint rec_fold;
1786
- hash_table_t * hash;
1787
- hash_cell_t * cell;
1785
+ hash_table_t * hash;
1786
+ hash_cell_t * cell;
1788
1787
lock_t * node;
1789
1788
lock_t * next;
1790
1789
@@ -5197,7 +5196,7 @@ lock_release(
5197
5196
ut_d (lock_check_dict_lock (lock));
5198
5197
5199
5198
if (lock_get_type_low (lock) == LOCK_REC) {
5200
-
5199
+
5201
5200
lock_rec_dequeue_from_page (lock);
5202
5201
} else {
5203
5202
dict_table_t * table;
You can’t perform that action at this time.
0 commit comments