database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Removed compiler warnings

Browse Source
This commit is contained in:
Michael Widenius
2019-01-01 15:12:39 +02:00
parent 17b73fb954
commit 88cc78c9c4
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/opt_range.cc
View File

@ -2841,10 +2841,6 @@ bool create_key_parts_for_pseudo_indexes(RANGE_OPT_PARAM *param,
{ {
Field **field_ptr; Field **field_ptr;
TABLE *table= param->table; TABLE *table= param->table;
partition_info *part_info= NULL;
#ifdef WITH_PARTITION_STORAGE_ENGINE
part_info= table->part_info;
#endif
uint parts= 0; uint parts= 0;
for (field_ptr= table->field; *field_ptr; field_ptr++) for (field_ptr= table->field; *field_ptr; field_ptr++)

3
storage/innobase/srv/srv0srv.cc
View File

@ -2402,6 +2402,7 @@ loop:
/** @return whether purge should exit due to shutdown */ /** @return whether purge should exit due to shutdown */
static bool srv_purge_should_exit() static bool srv_purge_should_exit()
{ {
uint32_t history_size __attribute__((unused));
ut_ad(srv_shutdown_state == SRV_SHUTDOWN_NONE ut_ad(srv_shutdown_state == SRV_SHUTDOWN_NONE
|| srv_shutdown_state == SRV_SHUTDOWN_CLEANUP); || srv_shutdown_state == SRV_SHUTDOWN_CLEANUP);
@ -2412,7 +2413,7 @@ static bool srv_purge_should_exit()
return(true); return(true);
} }
/* Slow shutdown was requested. */ /* 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 #if defined HAVE_SYSTEMD && !defined EMBEDDED_LIBRARY
static ib_time_t progress_time; static ib_time_t progress_time;
ib_time_t time = ut_time(); ib_time_t time = ut_time();