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 /sql/handler.cc | |
| parent | 5a47413934a0ba0aeb91224f1010bb70bd9b1e8a (diff) | |
| parent | 57f824b0990b0a8708665a4a9ede245ce6064539 (diff) | |
| download | mariadb-git-280fcf08085e43b5359ec79c0e34166e51b3ebd8.tar.gz | |
5.1 merge
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 1f6a3b9f665..135757597fc 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -343,6 +343,7 @@ int ha_init_errors(void) SETMSG(HA_ERR_AUTOINC_READ_FAILED, ER(ER_AUTOINC_READ_FAILED)); SETMSG(HA_ERR_AUTOINC_ERANGE, ER(ER_WARN_DATA_OUT_OF_RANGE)); SETMSG(HA_ERR_TOO_MANY_CONCURRENT_TRXS, ER(ER_TOO_MANY_CONCURRENT_TRXS)); + SETMSG(HA_ERR_TABLE_IN_FK_CHECK, "Table being used in foreign key check"); /* Register the error messages for use with my_error(). */ return my_error_register(errmsgs, HA_ERR_FIRST, HA_ERR_LAST); @@ -2889,6 +2890,7 @@ void handler::print_error(int error, myf errflag) case HA_ERR_TOO_MANY_CONCURRENT_TRXS: textno= ER_TOO_MANY_CONCURRENT_TRXS; break; + case HA_ERR_TABLE_IN_FK_CHECK: default: { /* The error was "unknown" to this function. |