diff options
| author | Michael Widenius <monty@mysql.com> | 2008-06-04 12:44:39 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-06-04 12:44:39 +0300 |
| commit | 06fd8990235095b6e8752a453284dc284a9a4c23 (patch) | |
| tree | c72a0a90a2f2f00a3e7d001ba4fe1c200da8b404 /mysql-test | |
| parent | 59294fb5710778a668ae03752d668f945728c60e (diff) | |
| parent | 11ea5a1bd7ae80de25b44ea39115f7e92e5758f0 (diff) | |
| download | mariadb-git-06fd8990235095b6e8752a453284dc284a9a4c23.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/maria-recover.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/maria-recover.test | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/r/maria-recover.result b/mysql-test/r/maria-recover.result index 9e0908b478a..f470d05081b 100644 --- a/mysql-test/r/maria-recover.result +++ b/mysql-test/r/maria-recover.result @@ -27,7 +27,6 @@ Warnings: Error 145 Table './mysqltest/t_corrupted2' is marked as crashed and should be repaired Error 1194 Table 't_corrupted2' is marked as crashed and should be repaired Error 1034 1 client is using or hasn't closed the table properly -Error 126 Incorrect key file for table './mysqltest/t_corrupted2.MAI'; try to repair it Error 1034 Wrong base information on indexpage at page: 1 select * from t_corrupted2; a diff --git a/mysql-test/t/maria-recover.test b/mysql-test/t/maria-recover.test index d6ec28c6b01..d6604d8f94e 100644 --- a/mysql-test/t/maria-recover.test +++ b/mysql-test/t/maria-recover.test @@ -1,9 +1,6 @@ # Test of the --maria-recover option. --source include/have_maria.inc -# line below will be removed ---source include/have_debug.inc - select @@global.maria_recover; set global maria_recover=off; |