diff --git a/mysql-test/suite/galera/r/MDEV-35946.result b/mysql-test/suite/galera/r/MDEV-35946.result
new file mode 100644
index 0000000000000..3d965634da722
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-35946.result
@@ -0,0 +1,23 @@
+connection node_2;
+connection node_1;
+call mtr.add_suppression("Inconsistency detected: Inconsistent by consensus");
+connection node_1;
+connection node_2;
+connection node_1;
+SET lock_wait_timeout=0;
+SET GLOBAL wsrep_ignore_apply_errors= 0;
+CREATE TABLE t (a DATE) ENGINE=InnoDB;
+ALTER TABLE t MODIFY b INT;
+ERROR 42S22: Unknown column 'b' in 't'
+SET SESSION wsrep_sync_wait=0;
+SET SESSION wsrep_sync_wait=DEFAULT;
+DELETE FROM mysql.wsrep_streaming_log;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+connection node_2;
+SET SESSION wsrep_sync_wait = 0;
+Killing server ...
+connection node_1;
+SET SESSION wsrep_sync_wait = 0;
+Killing server ...
+connection node_2;
+DROP TABLE t;
diff --git a/mysql-test/suite/galera/t/MDEV-35946.test b/mysql-test/suite/galera/t/MDEV-35946.test
new file mode 100644
index 0000000000000..8c6c6c06821ed
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35946.test
@@ -0,0 +1,65 @@
+#
+# MDEV-35946: Assertion `thd->is_error()' failed in Sql_cmd_dml::prepare
+#
+--source include/have_innodb.inc
+--source include/galera_cluster.inc
+
+call mtr.add_suppression("Inconsistency detected: Inconsistent by consensus");
+
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
+--connection node_1
+SET lock_wait_timeout=0;
+SET GLOBAL wsrep_ignore_apply_errors= 0;
+
+CREATE TABLE t (a DATE) ENGINE=InnoDB;
+--error ER_BAD_FIELD_ERROR
+ALTER TABLE t MODIFY b INT;
+
+#
+# Wait for the node to disconnect from cluster.
+# This is due to ALTER failing and error voting
+# not agreeing on the error
+# (wsrep_ignore_apply_errors set differently on node_1)
+#
+SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 'Disconnected' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
+--source include/wait_condition.inc
+SET SESSION wsrep_sync_wait=DEFAULT;
+
+#
+# If bug is present, assertion will fire
+# during the execution of the following DELETE
+#
+--error ER_LOCK_WAIT_TIMEOUT
+DELETE FROM mysql.wsrep_streaming_log;
+
+#
+# Kill the entire cluster and restart
+#
+--connection node_2
+SET SESSION wsrep_sync_wait = 0;
+--source include/kill_galera.inc
+
+--connection node_1
+SET SESSION wsrep_sync_wait = 0;
+--source include/kill_galera.inc
+
+--remove_file $MYSQLTEST_VARDIR/mysqld.1/data/grastate.dat
+--let $start_mysqld_params =--wsrep-new-cluster
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/start_mysqld.inc
+
+--connection node_2
+--let $start_mysqld_params =
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--source include/start_mysqld.inc
+
+#
+# Cleanup
+#
+DROP TABLE t;
+--source include/auto_increment_offset_restore.inc
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 0bf5d083d26f8..7252de23568e7 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1608,7 +1608,12 @@ bool wsrep_sync_wait (THD* thd, uint mask)
       This allows autocommit SELECTs and a first SELECT after SET AUTOCOMMIT=0
       TODO: modify to check if thd has locked any rows.
     */
-    return thd->wsrep_cs().sync_wait(-1);
+    if (thd->wsrep_cs().sync_wait(-1))
+    {
+      wsrep_override_error(thd, thd->wsrep_cs().current_error(),
+                           thd->wsrep_cs().current_error_status());
+      return true;
+    }
   }
 
   return false;