database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

compiler warnings

Browse Source
This commit is contained in:
Sergei Golubchik
2014-09-04 21:37:10 +02:00
parent fc2df3c637
commit fe0ff58000
8 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wsrep.h
View File

@ -23,7 +23,7 @@
#if !defined(EMBEDDED_LIBRARY) #if !defined(EMBEDDED_LIBRARY)
#define WSREP_FORMAT(my_format) \ #define WSREP_FORMAT(my_format) \
((wsrep_forced_binlog_format != BINLOG_FORMAT_UNSPEC) ? \ ((wsrep_forced_binlog_format != BINLOG_FORMAT_UNSPEC) ? \
wsrep_forced_binlog_format : my_format) ((enum enum_binlog_format)wsrep_forced_binlog_format) : my_format)
#else #else
#define WSREP_FORMAT(my_format) my_format #define WSREP_FORMAT(my_format) my_format
#endif /* && !EMBEDDED_LIBRARY */ #endif /* && !EMBEDDED_LIBRARY */

3
mysys/thr_lock.c
View File

@ -862,7 +862,6 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
{ {
wsrep_lock_inserted= TRUE; wsrep_lock_inserted= TRUE;
} }
wsrep_read_wait:
#endif #endif
wait_queue= &lock->read_wait; wait_queue= &lock->read_wait;
@ -1011,8 +1010,6 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
{ {
wsrep_lock_inserted= TRUE; wsrep_lock_inserted= TRUE;
} }
wsrep_write_wait:
#endif #endif
wait_queue= &lock->write_wait; wait_queue= &lock->write_wait;

2
sql/event_data_objects.h
View File

@ -85,7 +85,7 @@ class Event_queue_element : public Event_basic
public: public:
int on_completion; int on_completion;
int status; int status;
longlong originator; uint32 originator;
my_time_t last_executed; my_time_t last_executed;
my_time_t execute_at; my_time_t execute_at;

2
sql/event_parse_data.h
View File

@ -57,7 +57,7 @@ public:
int on_completion; int on_completion;
int status; int status;
bool status_changed; bool status_changed;
longlong originator; uint32 originator;
/* /*
do_not_create will be set if STARTS time is in the past and do_not_create will be set if STARTS time is in the past and
on_completion == ON_COMPLETION_DROP. on_completion == ON_COMPLETION_DROP.

2
sql/sql_class.cc
View File

@ -895,11 +895,11 @@ THD::THD(bool is_applier)
wsrep_applier(is_applier), wsrep_applier(is_applier),
wsrep_applier_closing(false), wsrep_applier_closing(false),
wsrep_client_thread(false), wsrep_client_thread(false),
wsrep_apply_toi(false),
wsrep_po_handle(WSREP_PO_INITIALIZER), wsrep_po_handle(WSREP_PO_INITIALIZER),
wsrep_po_cnt(0), wsrep_po_cnt(0),
// wsrep_po_in_trans(false), // wsrep_po_in_trans(false),
wsrep_apply_format(0), wsrep_apply_format(0),
wsrep_apply_toi(false),
#endif #endif
m_parser_state(NULL), m_parser_state(NULL),
#if defined(ENABLED_DEBUG_SYNC) #if defined(ENABLED_DEBUG_SYNC)

3
sql/sql_select.cc
View File

@ -22463,8 +22463,7 @@ static bool add_ref_to_table_cond(THD *thd, JOIN_TAB *join_tab)
} }
if (join_tab->select) if (join_tab->select)
{ {
Item *cond_copy; Item *UNINIT_VAR(cond_copy);
UNINIT_VAR(cond_copy); // used when pre_idx_push_select_cond!=NULL
if (join_tab->select->pre_idx_push_select_cond) if (join_tab->select->pre_idx_push_select_cond)
cond_copy= cond->copy_andor_structure(thd); cond_copy= cond->copy_andor_structure(thd);
if (join_tab->select->cond) if (join_tab->select->cond)

2
sql/wsrep_thd.cc
View File

@ -90,6 +90,7 @@ void wsrep_client_rollback(THD *thd)
#define NUMBER_OF_FIELDS_TO_IDENTIFY_WORKER 2 #define NUMBER_OF_FIELDS_TO_IDENTIFY_WORKER 2
//#include "rpl_info_factory.h" //#include "rpl_info_factory.h"
#if 0
static Relay_log_info* wsrep_relay_log_init(const char* log_fname) static Relay_log_info* wsrep_relay_log_init(const char* log_fname)
{ {
@ -110,6 +111,7 @@ static Relay_log_info* wsrep_relay_log_init(const char* log_fname)
return rli; return rli;
} }
#endif
class Master_info; class Master_info;

2
storage/maria/ma_checkpoint.c
View File

@ -230,7 +230,7 @@ static int really_execute_checkpoint(void)
sizeof(checkpoint_start_log_horizon_char); sizeof(checkpoint_start_log_horizon_char);
for (i= 0; i < (sizeof(record_pieces)/sizeof(record_pieces[0])); i++) for (i= 0; i < (sizeof(record_pieces)/sizeof(record_pieces[0])); i++)
{ {
log_array[TRANSLOG_INTERNAL_PARTS + 1 + i].str= record_pieces[i].str; log_array[TRANSLOG_INTERNAL_PARTS + 1 + i].str= (uchar*)record_pieces[i].str;
log_array[TRANSLOG_INTERNAL_PARTS + 1 + i].length= record_pieces[i].length; log_array[TRANSLOG_INTERNAL_PARTS + 1 + i].length= record_pieces[i].length;
total_rec_length+= (translog_size_t) record_pieces[i].length; total_rec_length+= (translog_size_t) record_pieces[i].length;
} }