From 96037a6f0337bab5b1468e64ef5cd87c6f1751ba Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 8 May 2019 23:14:09 +0300 Subject: [PATCH] Updated error message for HA_ERR_INCOMPATIBLE_DEFINITION --- include/my_handler_errors.h | 2 +- mysql-test/main/repair.result | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h index f682861f3ab..f6cdd666f07 100644 --- a/include/my_handler_errors.h +++ b/include/my_handler_errors.h @@ -101,7 +101,7 @@ static const char *handler_error_messages[]= "Operation was interrupted by end user (probably kill command?)", "Disk full", /* 190 */ - "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this", + "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You may have retry or dump and restore the table to fix this", "Too many words in a FTS phrase or proximity search", "Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.", "Foreign key cascade delete/update exceeds max depth", diff --git a/mysql-test/main/repair.result b/mysql-test/main/repair.result index 18a7cf509c4..da634e61432 100644 --- a/mysql-test/main/repair.result +++ b/mysql-test/main/repair.result @@ -189,14 +189,14 @@ drop tables t1, t2; # # Test with a saved table from 3.23 select count(*) from t1; -ERROR HY000: Got error 190 "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump an" from storage engine MyISAM +ERROR HY000: Got error 190 "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You may have retry " from storage engine MyISAM check table t1; Table Op Msg_type Msg_text -test.t1 check Error Got error 190 "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump an" from storage engine MyISAM +test.t1 check Error Got error 190 "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You may have retry " from storage engine MyISAM test.t1 check error Corrupt repair table t1; Table Op Msg_type Msg_text -test.t1 repair Error Got error 190 "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump an" from storage engine MyISAM +test.t1 repair Error Got error 190 "Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You may have retry " from storage engine MyISAM test.t1 repair error Corrupt repair table t1 use_frm; Table Op Msg_type Msg_text