Skip to content
Permalink
Browse files

Fixed compiler warnings

  • Loading branch information...
montywi committed Apr 7, 2016
1 parent 031e344 commit 2189df3cddea8a7bdb561573e7aa906a59b981d6
Showing with 9 additions and 10 deletions.
  1. +1 −2 sql/sql_parse.cc
  2. +4 −4 storage/innobase/lock/lock0lock.cc
  3. +4 −4 storage/xtradb/lock/lock0lock.cc
@@ -1122,15 +1122,14 @@ static enum enum_server_command fetch_command(THD *thd, char *packet)
{
enum enum_server_command
command= (enum enum_server_command) (uchar) packet[0];
NET *net= &thd->net;
DBUG_ENTER("fetch_command");

if (command >= COM_END ||
(command >= COM_MDB_GAP_BEG && command <= COM_MDB_GAP_END))
command= COM_END; // Wrong command

DBUG_PRINT("info",("Command on %s = %d (%s)",
vio_description(net->vio), command,
vio_description(thd->net.vio), command,
command_name[command].str));
DBUG_RETURN(command);
}
@@ -6817,7 +6817,7 @@ lock_clust_rec_modify_check_and_lock(
lock_rec_convert_impl_to_expl(block, rec, index, offsets);

lock_mutex_enter();
trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);

ut_ad(lock_table_has(trx, index->table, LOCK_IX));

@@ -6877,7 +6877,7 @@ lock_sec_rec_modify_check_and_lock(
index record, and this would not have been possible if another active
transaction had modified this secondary index record. */

trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);
lock_mutex_enter();

ut_ad(lock_table_has(trx, index->table, LOCK_IX));
@@ -6977,7 +6977,7 @@ lock_sec_rec_read_check_and_lock(
lock_rec_convert_impl_to_expl(block, rec, index, offsets);
}

trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);
lock_mutex_enter();

ut_ad(mode != LOCK_X
@@ -7051,7 +7051,7 @@ lock_clust_rec_read_check_and_lock(
}

lock_mutex_enter();
trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);

ut_ad(mode != LOCK_X
|| lock_table_has(trx, index->table, LOCK_IX));
@@ -6890,7 +6890,7 @@ lock_clust_rec_modify_check_and_lock(
lock_rec_convert_impl_to_expl(block, rec, index, offsets);

lock_mutex_enter();
trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);

ut_ad(lock_table_has(trx, index->table, LOCK_IX));

@@ -6954,7 +6954,7 @@ lock_sec_rec_modify_check_and_lock(
index record, and this would not have been possible if another active
transaction had modified this secondary index record. */

trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);
lock_mutex_enter();

ut_ad(lock_table_has(trx, index->table, LOCK_IX));
@@ -7063,7 +7063,7 @@ lock_sec_rec_read_check_and_lock(
lock_rec_convert_impl_to_expl(block, rec, index, offsets);
}

trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);
lock_mutex_enter();

ut_ad(mode != LOCK_X
@@ -7146,7 +7146,7 @@ lock_clust_rec_read_check_and_lock(
}

lock_mutex_enter();
trx_t* trx = thr_get_trx(thr);
trx_t* trx __attribute__((unused))= thr_get_trx(thr);

ut_ad(mode != LOCK_X
|| lock_table_has(trx, index->table, LOCK_IX));

0 comments on commit 2189df3

Please sign in to comment.
You can’t perform that action at this time.