diff options
| author | Satya B <satya.bn@sun.com> | 2009-07-24 12:15:06 +0530 |
|---|---|---|
| committer | Satya B <satya.bn@sun.com> | 2009-07-24 12:15:06 +0530 |
| commit | 30441aeadf28f053a75b58ec4c46d25dadc2ba97 (patch) | |
| tree | e850059710c4ddef34b737bba2433da01983614e /sql/handler.cc | |
| parent | 9c708fdf1e0fac8debbfe561a3fd50c9c653a613 (diff) | |
| parent | 559e2f1c1e151baec1ec37796640f53af0bd1b30 (diff) | |
| download | mariadb-git-30441aeadf28f053a75b58ec4c46d25dadc2ba97.tar.gz | |
merge 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index e65ceba4181..d9e8f5614f2 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -342,6 +342,7 @@ int ha_init_errors(void) SETMSG(HA_ERR_TABLE_READONLY, ER(ER_OPEN_AS_READONLY)); 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)); /* Register the error messages for use with my_error(). */ return my_error_register(errmsgs, HA_ERR_FIRST, HA_ERR_LAST); @@ -2747,6 +2748,9 @@ void handler::print_error(int error, myf errflag) case HA_ERR_AUTOINC_ERANGE: textno= ER_WARN_DATA_OUT_OF_RANGE; break; + case HA_ERR_TOO_MANY_CONCURRENT_TRXS: + textno= ER_TOO_MANY_CONCURRENT_TRXS; + break; default: { /* The error was "unknown" to this function. |