diff options
| -rw-r--r-- | sql-common/client.c | 4 | ||||
| -rw-r--r-- | sql/opt_range.cc | 2 | ||||
| -rw-r--r-- | sql/rpl_gtid.cc | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 5ffc8c49fea..9fa259ff0d5 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -129,10 +129,6 @@ static void mysql_close_free(MYSQL *mysql); static void mysql_prune_stmt_list(MYSQL *mysql); static int cli_report_progress(MYSQL *mysql, char *packet, uint length); -#if !defined(__WIN__) -static int wait_for_data(my_socket fd, uint timeout); -#endif - CHARSET_INFO *default_client_charset_info = &my_charset_latin1; /* Server error code and message */ diff --git a/sql/opt_range.cc b/sql/opt_range.cc index da18a30ac78..6b72f9c336b 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -3557,9 +3557,9 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item *cond) break; bitmap_set_bit(&handled_columns, key_part->fieldnr-1); } - double selectivity_mult; if (i) { + double UNINIT_VAR(selectivity_mult); /* There is at least 1-column prefix of columns whose selectivity has not yet been accounted for. diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 709cb284df5..77645fd3c7a 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -122,7 +122,7 @@ rpl_slave_state::check_duplicate_gtid(rpl_gtid *gtid, rpl_group_info *rgi) int res; bool did_enter_cond= false; PSI_stage_info old_stage; - THD *thd; + THD *UNINIT_VAR(thd); Relay_log_info *rli= rgi->rli; mysql_mutex_lock(&LOCK_slave_state); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 479d9a62d11..6b044eebdd1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -23479,7 +23479,7 @@ int JOIN::save_explain_data_intern(Explain_query *output, bool need_tmp_table, bool need_order, bool distinct, const char *message) { - Explain_node *explain_node; + Explain_node *UNINIT_VAR(explain_node); JOIN *join= this; /* Legacy: this code used to be a non-member function */ THD *thd=join->thd; const CHARSET_INFO *cs= system_charset_info; diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 1b022cd3468..54d8bfca346 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -172,6 +172,7 @@ static inline uint32_t get_len_of_offsets(KEY_AND_COL_INFO* kc_info, TABLE_SHARE } +#ifdef NOT_USED static int get_thread_query_string(my_thread_id id, String &qs) { mysql_mutex_lock(&LOCK_thread_count); I_List_iterator<THD> it(threads); @@ -196,6 +197,7 @@ static int get_thread_query_string(my_thread_id id, String &qs) { mysql_mutex_unlock(&LOCK_thread_count); return 0; } +#endif static int allocate_key_and_col_info ( TABLE_SHARE* table_share, KEY_AND_COL_INFO* kc_info) { int error; |