diff options
| author | Michael Widenius <monty@mariadb.org> | 2019-01-01 15:12:39 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2019-01-01 15:12:39 +0200 |
| commit | 88cc78c9c41ae6c1fde2d87c86d9ea9bb0f8a0f1 (patch) | |
| tree | 84baad5ce99b5cd61cfb25fd53d262e7f45abbe7 | |
| parent | 17b73fb95445d043e90026924c1eb38e4654e46b (diff) | |
| download | mariadb-git-88cc78c9c41ae6c1fde2d87c86d9ea9bb0f8a0f1.tar.gz | |
Removed compiler warnings
| -rw-r--r-- | sql/opt_range.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index f01191d3c7e..05d765e399a 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -2841,10 +2841,6 @@ bool create_key_parts_for_pseudo_indexes(RANGE_OPT_PARAM *param, { Field **field_ptr; TABLE *table= param->table; - partition_info *part_info= NULL; - #ifdef WITH_PARTITION_STORAGE_ENGINE - part_info= table->part_info; - #endif uint parts= 0; for (field_ptr= table->field; *field_ptr; field_ptr++) diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 53aae6fa417..025c93b8399 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -2402,6 +2402,7 @@ loop: /** @return whether purge should exit due to shutdown */ static bool srv_purge_should_exit() { + uint32_t history_size __attribute__((unused)); ut_ad(srv_shutdown_state == SRV_SHUTDOWN_NONE || srv_shutdown_state == SRV_SHUTDOWN_CLEANUP); @@ -2412,7 +2413,7 @@ static bool srv_purge_should_exit() return(true); } /* Slow shutdown was requested. */ - if (uint32_t history_size = trx_sys.rseg_history_len) { + if ((history_size = trx_sys.rseg_history_len)) { #if defined HAVE_SYSTEMD && !defined EMBEDDED_LIBRARY static ib_time_t progress_time; ib_time_t time = ut_time(); |