diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
commit | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (patch) | |
tree | 0180226f5648752d1d5bc2b7dd23e7cecf3253b1 /mysys | |
parent | 5a47413934a0ba0aeb91224f1010bb70bd9b1e8a (diff) | |
parent | 57f824b0990b0a8708665a4a9ede245ce6064539 (diff) | |
download | mariadb-git-280fcf08085e43b5359ec79c0e34166e51b3ebd8.tar.gz |
5.1 merge
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_handler_errors.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h index dbc62100a70..e6514536735 100644 --- a/mysys/my_handler_errors.h +++ b/mysys/my_handler_errors.h @@ -79,5 +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" + "", + "", + "Row is not visible by the current transaction", + "Table is being used in foreign key check" /* HA_ERR_TABLE_IN_FK_CHECK */ }; |