database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source 
The MDEV-17062 fix in commit c4195305b2
was omitted.
This commit is contained in:
Marko Mäkelä
2020-01-20 15:49:48 +02:00
parent 7ea413ac2d bc43bf3e43
commit 87a61355e8
261 changed files with 3749 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/myisam_debug.result
View File

@ -36,10 +36,10 @@ create table t1 (a int, index(a));
lock tables t1 write;
insert t1 values (1),(2),(1);
set @old_dbug=@@debug_dbug;
set debug_dbug='+d,mi_lock_database_failure';
SET debug_dbug='+d,mi_lock_database_failure';
unlock tables;
Warnings:
Error 126 Index for table './test/t1.MYI' is corrupt; try to repair it
Error 1030 Got error 22 "Invalid argument" from storage engine MyISAM
set debug_dbug=@old_dbug;
SET debug_dbug=@old_dbug;
drop table t1;