1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
don't treat deadlock or timeout as a sign of corruption
This commit is contained in:
Sergei Golubchik 2009-02-06 22:14:13 +01:00
parent 5564e53c42
commit f0261aca0b
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/maria/r/maria_notembedded.result
View File

@ -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;

1
mysql-test/suite/maria/t/maria_notembedded.test
View File

@ -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

2
storage/maria/ma_write.c
View File

@ -325,6 +325,8 @@ err:
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)
{ {