compiler warnings

8 files changed, 8 insertions, 10 deletions

diff --git a/include/wsrep.h b/include/wsrep.h
index c261d9c4b5f..9e0f052b340 100644
--- a/include/wsrep.h
+++ b/include/wsrep.h
@@ -23,7 +23,7 @@
 #if !defined(EMBEDDED_LIBRARY)
 #define WSREP_FORMAT(my_format)                           \
   ((wsrep_forced_binlog_format != BINLOG_FORMAT_UNSPEC) ? \
-   wsrep_forced_binlog_format : my_format)
+   ((enum enum_binlog_format)wsrep_forced_binlog_format) : my_format)
 #else
 #define WSREP_FORMAT(my_format) my_format
 #endif /* && !EMBEDDED_LIBRARY */
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index acc7d718546..cd30c30afea 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -862,7 +862,6 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
     {
       wsrep_lock_inserted= TRUE;
     }
-  wsrep_read_wait:
 #endif
 
     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_write_wait:
-
 #endif
 
     wait_queue= &lock->write_wait;
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
index 2483c564dff..8113fcb0e2e 100644
--- a/sql/event_data_objects.h
+++ b/sql/event_data_objects.h
@@ -85,7 +85,7 @@ class Event_queue_element : public Event_basic
 public:
   int on_completion;
   int status;
-  longlong originator;
+  uint32 originator;
 
   my_time_t last_executed;
   my_time_t execute_at;
diff --git a/sql/event_parse_data.h b/sql/event_parse_data.h
index faf42db623a..3ca7fcaab72 100644
--- a/sql/event_parse_data.h
+++ b/sql/event_parse_data.h
@@ -57,7 +57,7 @@ public:
   int on_completion;
   int status;
   bool status_changed;
-  longlong originator;
+  uint32 originator;
   /*
     do_not_create will be set if STARTS time is in the past and
     on_completion == ON_COMPLETION_DROP.
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index db2638254ec..919361b4b30 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -895,11 +895,11 @@ THD::THD(bool is_applier)
    wsrep_applier(is_applier),
    wsrep_applier_closing(false),
    wsrep_client_thread(false),
+   wsrep_apply_toi(false),
    wsrep_po_handle(WSREP_PO_INITIALIZER),
    wsrep_po_cnt(0),
 //   wsrep_po_in_trans(false),
    wsrep_apply_format(0),
-   wsrep_apply_toi(false),
 #endif
    m_parser_state(NULL),
 #if defined(ENABLED_DEBUG_SYNC)
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8a7cb9cdafa..e46498c0dc9 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -22463,8 +22463,7 @@ static bool add_ref_to_table_cond(THD *thd, JOIN_TAB *join_tab)
   }
   if (join_tab->select)
   {
-    Item *cond_copy;
-    UNINIT_VAR(cond_copy); // used when pre_idx_push_select_cond!=NULL
+    Item *UNINIT_VAR(cond_copy);
     if (join_tab->select->pre_idx_push_select_cond)
       cond_copy= cond->copy_andor_structure(thd);
     if (join_tab->select->cond)
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc
index fabced2d11a..0779535d7fb 100644
--- a/sql/wsrep_thd.cc
+++ b/sql/wsrep_thd.cc
@@ -90,6 +90,7 @@ void wsrep_client_rollback(THD *thd)
 #define NUMBER_OF_FIELDS_TO_IDENTIFY_WORKER 2
 //#include "rpl_info_factory.h"
 
+#if 0
 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;
 }
+#endif
 
 class Master_info;
 
diff --git a/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c
index e4adf5fbccd..4ed4e813cc9 100644
--- a/storage/maria/ma_checkpoint.c
+++ b/storage/maria/ma_checkpoint.c
@@ -230,7 +230,7 @@ static int really_execute_checkpoint(void)
       sizeof(checkpoint_start_log_horizon_char);
     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;
       total_rec_length+= (translog_size_t) record_pieces[i].length;
     }