diff --git a/mysql-test/suite/maria/r/maria_notembedded.result b/mysql-test/suite/maria/r/maria_notembedded.result
index cc9c26409ec..77325d24421 100644
--- a/mysql-test/suite/maria/r/maria_notembedded.result
+++ b/mysql-test/suite/maria/r/maria_notembedded.result
@@ -50,4 +50,7 @@ ERROR 23000: Duplicate entry '4' for key 'a'
 unlock tables;
 ERROR 23000: Duplicate entry '5' for key 'a'
 unlock tables;
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
 drop table t1;
diff --git a/mysql-test/suite/maria/t/maria_notembedded.test b/mysql-test/suite/maria/t/maria_notembedded.test
index afa749a653d..0f27802de27 100644
--- a/mysql-test/suite/maria/t/maria_notembedded.test
+++ b/mysql-test/suite/maria/t/maria_notembedded.test
@@ -89,6 +89,7 @@ unlock tables;
 disconnect con_d;
 
 connection default;
+check table t1;
 drop table t1;
 
 --disable_result_log
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c
index 630b1a69689..bfbeb813627 100644
--- a/storage/maria/ma_write.c
+++ b/storage/maria/ma_write.c
@@ -325,6 +325,8 @@ err:
   fatal_error= 0;
   if (my_errno == HA_ERR_FOUND_DUPP_KEY ||
       my_errno == HA_ERR_RECORD_FILE_FULL ||
+      my_errno == HA_ERR_LOCK_DEADLOCK ||
+      my_errno == HA_ERR_LOCK_WAIT_TIMEOUT ||
       my_errno == HA_ERR_NULL_IN_SPATIAL ||
       my_errno == HA_ERR_OUT_OF_MEM)
   {