diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
| commit | 0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb (patch) | |
| tree | 7e682617fcbdab399d2eafccb6a4800dfdc71e51 /mysys | |
| parent | 97ae1682f185be05276b172919e47fd86e9fd953 (diff) | |
| parent | df905524b218de07dddf5fa394af96edcc4ca483 (diff) | |
| download | mariadb-git-0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb.tar.gz | |
merge with mysql-5.1.63
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 */ }; |