From 2189df3cddea8a7bdb561573e7aa906a59b981d6 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Thu, 7 Apr 2016 20:09:57 +0300 Subject: [PATCH] Fixed compiler warnings --- sql/sql_parse.cc | 3 +-- storage/innobase/lock/lock0lock.cc | 8 ++++---- storage/xtradb/lock/lock0lock.cc | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7c50e4ed680..86095082252 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1122,7 +1122,6 @@ 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 || @@ -1130,7 +1129,7 @@ static enum enum_server_command fetch_command(THD *thd, char *packet) 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); } diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index 165db2d33ed..bc7ec1d221b 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -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)); diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc index c3044daafad..6d69f441019 100644 --- a/storage/xtradb/lock/lock0lock.cc +++ b/storage/xtradb/lock/lock0lock.cc @@ -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));