diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-01 00:54:03 +0100 |
| commit | 59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5 (patch) | |
| tree | 3e4a302ccf3912d4d8a40aa271414003bfe7c9b6 /include/my_handler_errors.h | |
| parent | ce02738d7f2f2688eeec7004dd6a30293d36044f (diff) | |
| parent | 6b6d40fa6ca1fe36f2a51c2723c58dfb3fc025bb (diff) | |
| download | mariadb-git-59d9d08e2b6f6f35e781d24c47d33d26fb4ba2a5.tar.gz | |
5.5 merge
Diffstat (limited to 'include/my_handler_errors.h')
| -rw-r--r-- | include/my_handler_errors.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h index f2c51773e83..2db536edd1c 100644 --- a/include/my_handler_errors.h +++ b/include/my_handler_errors.h @@ -84,11 +84,12 @@ static const char *handler_error_messages[]= "Index column length exceeds limit", "Index corrupted", "Undo record too big", - "Table is being used in foreign key check", "Invalid InnoDB FTS Doc ID", + "Table is being used in foreign key check", "Row is not visible by the current transaction", "Operation was interrupted by end user (probably kill command?)", - "Disk full" + "Disk full", + "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" }; #endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */ |