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 /storage | |
| parent | 9c708fdf1e0fac8debbfe561a3fd50c9c653a613 (diff) | |
| parent | 559e2f1c1e151baec1ec37796640f53af0bd1b30 (diff) | |
| download | mariadb-git-30441aeadf28f053a75b58ec4c46d25dadc2ba97.tar.gz | |
merge 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 2f29ca62000..a39857c0f05 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -734,17 +734,7 @@ convert_error_code_to_mysql( return(HA_ERR_LOCK_TABLE_FULL); } else if (error == DB_TOO_MANY_CONCURRENT_TRXS) { - /* Once MySQL add the appropriate code to errmsg.txt then - we can get rid of this #ifdef. NOTE: The code checked by - the #ifdef is the suggested name for the error condition - and the actual error code name could very well be different. - This will require some monitoring, ie. the status - of this request on our part.*/ -#ifdef ER_TOO_MANY_CONCURRENT_TRXS - return(ER_TOO_MANY_CONCURRENT_TRXS); -#else - return(HA_ERR_RECORD_FILE_FULL); -#endif + return(HA_ERR_TOO_MANY_CONCURRENT_TRXS); } else if (error == DB_UNSUPPORTED) { |