MariaDB adjustments.

scripts/mysql_config.pl

@@ -53,7 +53,7 @@ my $cwd = cwd();
 my $basedir;
 
 my $socket  = '/tmp/mysql.sock';
-my $version = '5.5.59';
+my $version = '5.5.60';
 
 sub which
 {

sql/wsrep_hton.cc

@@ -106,7 +106,7 @@ void wsrep_post_commit(THD* thd, bool all)
     case LOCAL_COMMIT:
     {
       DBUG_ASSERT(thd->wsrep_trx_meta.gtid.seqno != WSREP_SEQNO_UNDEFINED);
-      if (wsrep->post_commit(wsrep, &thd->wsrep_ws_handle))
+      if (wsrep && wsrep->post_commit(wsrep, &thd->wsrep_ws_handle))
       {
         DBUG_PRINT("wsrep", ("set committed fail"));
         WSREP_WARN("set committed fail: %llu %d",
@@ -129,7 +129,7 @@ void wsrep_post_commit(THD* thd, bool all)
         rolls back to savepoint after first operation.
       */
       if (all && thd->wsrep_conflict_state != MUST_REPLAY &&
-         wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle))
+          wsrep && wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle))
       {
         WSREP_WARN("post_rollback fail: %llu %d",
                    (long long)thd->thread_id, thd->stmt_da->status());