diff options
| author | Monty <monty@mariadb.org> | 2018-08-28 09:42:22 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-08-28 12:14:13 +0300 |
| commit | 8cc53aded9f6cf7a6dbd66699e896adfda504a04 (patch) | |
| tree | 4cf8174a5d069f81a3c034d3928d92314da85965 /mysql-test/main | |
| parent | f451fd8c06a02b6d710fcaeb3298212732f1dc5c (diff) | |
| download | mariadb-git-8cc53aded9f6cf7a6dbd66699e896adfda504a04.tar.gz | |
MDEV-17068 mysql system table is marked as crashed and should be repaired after the server crashes or is killed
- Changed ERROR to WARNING for MyISAM/Aria message
that are warnings in the check utilities.
This affects for example "client is using or
hasn't closed the table properly".
- Print "Table is fixed" if check succeded in
fixing the table.
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/delayed.result | 3 | ||||
| -rw-r--r-- | mysql-test/main/myisam.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/myisam_recover.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/repair.result | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/main/delayed.result b/mysql-test/main/delayed.result index d10f4ae22cf..26a1fc670f4 100644 --- a/mysql-test/main/delayed.result +++ b/mysql-test/main/delayed.result @@ -500,7 +500,8 @@ call mtr.add_suppression("Checking table"); insert delayed into t1 values (2,2); Warnings: Error 145 Table './test/t1' is marked as crashed and should be repaired -Error 1034 1 client is using or hasn't closed the table properly +Warning 1034 1 client is using or hasn't closed the table properly +Note 1034 Table is fixed insert delayed into t1 values (3,3); flush tables t1; select * from t1; diff --git a/mysql-test/main/myisam.result b/mysql-test/main/myisam.result index 4864ef0bb13..bef8790e141 100644 --- a/mysql-test/main/myisam.result +++ b/mysql-test/main/myisam.result @@ -2545,7 +2545,7 @@ INSERT INTO t1 VALUES ('0'),('0'),('0'),('0'),('0'),('0'),('0'); Warnings: Error 1034 myisam_sort_buffer_size is too small. X -Error 1034 Number of rows changed from 0 to 157 +Warning 1034 Number of rows changed from 0 to 157 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size; INSERT INTO t1 VALUES('1'); SELECT * FROM t1, t1 AS a1 WHERE t1.a=1 AND a1.a=1; diff --git a/mysql-test/main/myisam_recover.result b/mysql-test/main/myisam_recover.result index 92df67b42d1..3a2c424c8b2 100644 --- a/mysql-test/main/myisam_recover.result +++ b/mysql-test/main/myisam_recover.result @@ -87,7 +87,7 @@ a 6 Warnings: Error 145 Table 't1' is marked as crashed and should be repaired -Error 1034 Number of rows changed from 3 to 6 +Warning 1034 Number of rows changed from 3 to 6 # # Cleanup # @@ -139,7 +139,7 @@ a 4 Warnings: Error 145 Table 't1' is marked as crashed and should be repaired -Error 1034 Number of rows changed from 1 to 2 +Warning 1034 Number of rows changed from 1 to 2 connect con2, localhost, root; ALTER TABLE t2 ADD val INT; connection default; diff --git a/mysql-test/main/repair.result b/mysql-test/main/repair.result index 75d7525ee71..18a7cf509c4 100644 --- a/mysql-test/main/repair.result +++ b/mysql-test/main/repair.result @@ -78,7 +78,7 @@ INSERT INTO t1 VALUES ('0'),('0'),('0'),('0'),('0'),('0'),('0'); Warnings: Error 1034 myisam_sort_buffer_size is too small. X -Error 1034 Number of rows changed from 0 to 157 +Warning 1034 Number of rows changed from 0 to 157 SET myisam_repair_threads=2; REPAIR TABLE t1; Table Op Msg_type Msg_text |