diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
| commit | 7f6f53a8df10c76f93848c8d06bc5af71051c525 (patch) | |
| tree | 9a539823cdf05f53574fdf91941b3a242025acba /mysys | |
| parent | 0e7e724d6b36b2f5b8a0604171adb750d7c82c9c (diff) | |
| parent | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (diff) | |
| download | mariadb-git-7f6f53a8df10c76f93848c8d06bc5af71051c525.tar.gz | |
5.2 merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_handler_errors.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h index 9f135a44121..92d9266ae73 100644 --- a/mysys/my_handler_errors.h +++ b/mysys/my_handler_errors.h @@ -79,7 +79,8 @@ static const char *handler_error_messages[]= "File too short; Expected more data in file", "Read page with wrong checksum", "Too many active concurrent transactions", - "Row is not visible by the current transaction", "Operation was interrupted by end user (probably kill command?)", - "Disk full" + "Disk full", + "Row is not visible by the current transaction", + "Table is being used in foreign key check" /* HA_ERR_TABLE_IN_FK_CHECK */ }; |