Commit fd30d07f authored by sensssz's avatar sensssz

Style fixes.

parent 149581a6
...@@ -1410,7 +1410,7 @@ handle_rpl_parallel_thread(void *arg) ...@@ -1410,7 +1410,7 @@ handle_rpl_parallel_thread(void *arg)
mysql_mutex_unlock(&rpt->LOCK_rpl_thread); mysql_mutex_unlock(&rpt->LOCK_rpl_thread);
my_thread_end(); my_thread_end();
return NULL; return NULL;
} }
......
...@@ -1096,8 +1096,8 @@ struct trx_t { ...@@ -1096,8 +1096,8 @@ struct trx_t {
time_t start_time; /*!< time the state last time became time_t start_time; /*!< time the state last time became
TRX_STATE_ACTIVE */ TRX_STATE_ACTIVE */
clock_t start_time_micro; /*!< start time of the transaction clock_t start_time_micro; /*!< start time of the transaction
in microseconds. */ in microseconds. */
lsn_t commit_lsn; /*!< lsn at the time of the commit */ lsn_t commit_lsn; /*!< lsn at the time of the commit */
table_id_t table_id; /*!< Table to drop iff dict_operation table_id_t table_id; /*!< Table to drop iff dict_operation
== TRX_DICT_OP_TABLE, or 0. */ == TRX_DICT_OP_TABLE, or 0. */
......
...@@ -53,7 +53,6 @@ Created 5/7/1996 Heikki Tuuri ...@@ -53,7 +53,6 @@ Created 5/7/1996 Heikki Tuuri
#include "row0mysql.h" #include "row0mysql.h"
#include "pars0pars.h" #include "pars0pars.h"
#include <inttypes.h>
#include <set> #include <set>
#ifdef WITH_WSREP #ifdef WITH_WSREP
...@@ -1756,11 +1755,11 @@ has_higher_priority( ...@@ -1756,11 +1755,11 @@ has_higher_priority(
return true; return true;
} }
if (trx_is_high_priority(lock1->trx)) { if (trx_is_high_priority(lock1->trx)) {
return true; return true;
} }
if (trx_is_high_priority(lock2->trx)) { if (trx_is_high_priority(lock2->trx)) {
return false; return false;
} }
// No preference. Compre them by wait mode and trx age. // No preference. Compre them by wait mode and trx age.
if (!lock_get_wait(lock1)) { if (!lock_get_wait(lock1)) {
return true; return true;
...@@ -1780,11 +1779,11 @@ static ...@@ -1780,11 +1779,11 @@ static
dberr_t dberr_t
lock_rec_insert_by_trx_age( lock_rec_insert_by_trx_age(
lock_t *in_lock) /*!< in: lock to be insert */{ lock_t *in_lock) /*!< in: lock to be insert */{
ulint space; ulint space;
ulint page_no; ulint page_no;
ulint rec_fold; ulint rec_fold;
hash_table_t* hash; hash_table_t* hash;
hash_cell_t* cell; hash_cell_t* cell;
lock_t* node; lock_t* node;
lock_t* next; lock_t* next;
...@@ -5197,7 +5196,7 @@ lock_release( ...@@ -5197,7 +5196,7 @@ lock_release(
ut_d(lock_check_dict_lock(lock)); ut_d(lock_check_dict_lock(lock));
if (lock_get_type_low(lock) == LOCK_REC) { if (lock_get_type_low(lock) == LOCK_REC) {
lock_rec_dequeue_from_page(lock); lock_rec_dequeue_from_page(lock);
} else { } else {
dict_table_t* table; dict_table_t* table;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment