refs codership/mysql-wsrep#184

- Adds runtime check wsrep_on(), to not interfere with default
  innodb behavior.

storage/innobase/lock/lock0wait.cc

@@ -394,8 +394,9 @@ lock_wait_suspend_thread(
 	if (lock_wait_timeout < 100000000
 	    && wait_time > (double) lock_wait_timeout) {
 #ifdef WITH_WSREP
-                if (!wsrep_is_BF_lock_timeout(trx)
-                    && trx->error_state != DB_DEADLOCK) {
+                if (!wsrep_on(trx->mysql_thd) ||
+                    (!wsrep_is_BF_lock_timeout(trx) &&
+                     trx->error_state != DB_DEADLOCK)) {
 #endif /* WITH_WSREP */
 
 		trx->error_state = DB_LOCK_WAIT_TIMEOUT;