Commit ceb9e92f authored by Sergei Golubchik's avatar Sergei Golubchik

Bug#42201 Maria: after a deadlock, table is marked as corrupted

don't treat deadlock or timeout as a sign of corruption
parent 9283b519
...@@ -50,4 +50,7 @@ ERROR 23000: Duplicate entry '4' for key 'a' ...@@ -50,4 +50,7 @@ ERROR 23000: Duplicate entry '4' for key 'a'
unlock tables; unlock tables;
ERROR 23000: Duplicate entry '5' for key 'a' ERROR 23000: Duplicate entry '5' for key 'a'
unlock tables; unlock tables;
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1; drop table t1;
...@@ -89,6 +89,7 @@ unlock tables; ...@@ -89,6 +89,7 @@ unlock tables;
disconnect con_d; disconnect con_d;
connection default; connection default;
check table t1;
drop table t1; drop table t1;
--disable_result_log --disable_result_log
......
...@@ -325,6 +325,8 @@ int maria_write(MARIA_HA *info, uchar *record) ...@@ -325,6 +325,8 @@ int maria_write(MARIA_HA *info, uchar *record)
fatal_error= 0; fatal_error= 0;
if (my_errno == HA_ERR_FOUND_DUPP_KEY || if (my_errno == HA_ERR_FOUND_DUPP_KEY ||
my_errno == HA_ERR_RECORD_FILE_FULL || 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_NULL_IN_SPATIAL ||
my_errno == HA_ERR_OUT_OF_MEM) my_errno == HA_ERR_OUT_OF_MEM)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment