mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
e14934d26d
REPAIR of merge table Bug #56422 CHECK TABLE run when the table is locked reports corruption along with timeout The crash happened if a table maintenance statement (ANALYZE TABLE, REPAIR TABLE, etc.) was executed on a MERGE table and opening and locking a child table failed. This could for example happen if a child table did not exist or if a lock timeout happened while waiting for a conflicting metadata lock to disappear. Since opening and locking the MERGE table and its children failed, the tables would be closed and the metadata locks released. However, TABLE_LIST::table for the MERGE table would still be set, with its value invalid since the tables had been closed. This caused the table maintenance statement to try to continue and upgrade the metadata lock on the MERGE table. But since the lock already had been released, this caused a segfault. This patch fixes the problem by setting TABLE_LIST::table to NULL if open_and_lock_tables() fails. This prevents maintenance statements from continuing and trying to upgrade the metadata lock. The patch includes a 5.5 version of the fix for Bug #46339 crash on REPAIR TABLE merge table USE_FRM. This bug caused REPAIR TABLE ... USE_FRM to give an assert when used on merge tables. The patch also enables the CHECK TABLE statement for log tables. Before, CHECK TABLE for log tables gave ER_CANT_LOCK_LOG_TABLE, yet still counted the statement as successfully executed. With the changes to table maintenance statement error handling in this patch, CHECK TABLE would no longer be considered as successful in this case. This would have caused upgrade scripts to mistakenly think that the general and slow logs are corrupted and have to be repaired. Enabling CHECK TABLES for log tables prevents this from happening. Finally, the patch changes the error message from "Corrupt" to "Operation failed" for a number of issues not related to table corruption. For example "Lock wait timeout exceeded" and "Deadlock found trying to get lock". Test cases added to merge.test and check.test.
41 lines
1 KiB
Text
41 lines
1 KiB
Text
drop table if exists t1,t2;
|
|
drop view if exists v1;
|
|
create table t1(n int not null, key(n), key(n), key(n), key(n));
|
|
check table t1 extended;
|
|
insert into t1 values (200000);
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check status OK
|
|
drop table t1;
|
|
Create table t1(f1 int);
|
|
Create table t2(f1 int);
|
|
Create view v1 as Select * from t1;
|
|
Check Table v1,t2;
|
|
Table Op Msg_type Msg_text
|
|
test.v1 check status OK
|
|
test.t2 check status OK
|
|
drop view v1;
|
|
drop table t1, t2;
|
|
CREATE TEMPORARY TABLE t1(a INT);
|
|
CHECK TABLE t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check status OK
|
|
REPAIR TABLE t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 repair status OK
|
|
DROP TABLE t1;
|
|
#
|
|
# Bug#56422 CHECK TABLE run when the table is locked reports corruption
|
|
# along with timeout
|
|
#
|
|
DROP TABLE IF EXISTS t1;
|
|
CREATE TABLE t1(a INT);
|
|
LOCK TABLE t1 WRITE;
|
|
# Connection con1
|
|
SET lock_wait_timeout= 1;
|
|
CHECK TABLE t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check Error Lock wait timeout exceeded; try restarting transaction
|
|
test.t1 check status Operation failed
|
|
# Connection default
|
|
UNLOCK TABLES;
|
|
DROP TABLE t1;
|