diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index 3da567ada38..ca8439aa386 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -1482,7 +1482,9 @@ end:
 
       WSREP_TO_ISOLATION_END;
 
+#ifdef WITH_WSREP
   error:
+#endif
       thd->tx_read_only= save_tx_read_only;
       thd->security_ctx->master_access= saved_master_access;
     }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 941ba505c20..883db8cfbe5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5730,7 +5730,9 @@ int mysqld_main(int argc, char **argv)
     }
   }
   else
+  {
     wsrep_init_startup (false);
+  }
 
  if (opt_bootstrap)
   {
diff --git a/sql/slave.cc b/sql/slave.cc
index 4c7e1d14f9c..999af743023 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -4406,7 +4406,9 @@ pthread_handler_t handle_slave_sql(void *arg)
   my_thread_init();
   DBUG_ENTER("handle_slave_sql");
 
+#ifdef WITH_WSREP
  wsrep_restart_point:
+#endif
 
   serial_rgi= new rpl_group_info(rli);
   thd = new THD; // note that contructor of THD uses DBUG_ !