Post-merge fix

sql/log.cc

@@ -569,7 +569,15 @@ void thd_binlog_trx_reset(THD * thd)
   {
     binlog_cache_mngr *const cache_mngr=
       (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
-    if (cache_mngr) cache_mngr->reset(false, true);
+    if (cache_mngr)
+    {
+      cache_mngr->reset(false, true);
+      if (!cache_mngr->stmt_cache.empty())
+      {
+        WSREP_DEBUG("pending events in stmt cache, sql: %s", thd->query());
+        cache_mngr->stmt_cache.reset();
+      }
+    }
   }
   thd->clear_binlog_table_maps();
 }

sql/wsrep_hton.cc

@@ -99,6 +99,14 @@ void wsrep_register_hton(THD* thd, bool all)
  */
 void wsrep_post_commit(THD* thd, bool all)
 {
+  /*
+    TODO: It can perhaps be fixed in a more elegant fashion by turning off
+    wsrep_emulate_binlog if wsrep_on=0 on server start.
+    https://github.com/codership/mysql-wsrep/issues/112
+  */
+  if (!WSREP_ON)
+    return;
+
   switch (thd->wsrep_exec_mode)
   {
   case LOCAL_COMMIT: