diff options
| author | unknown <monty@work.mysql.com> | 2001-09-18 04:17:52 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-18 04:17:52 +0200 |
| commit | ee88211100079afe8dc4aa2bad7a4d5126805f32 (patch) | |
| tree | 63012919b5be7bd7ba87583c4a399657e6ab81f1 /sql/handler.cc | |
| parent | 95a92f05f0034427b8738dabb7555560d1cd3dfa (diff) | |
| parent | 73068034e4c4b96d06c0ef6a7a1a07beeedc613d (diff) | |
| download | mariadb-git-ee88211100079afe8dc4aa2bad7a4d5126805f32.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
Docs/manual.texi:
Auto merged
extra/perror.c:
Auto merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/rpl000017-slave.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0c7f1c9c2b1..8b7b7fe6799 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -702,6 +702,9 @@ void handler::print_error(int error, myf errflag) case HA_ERR_LOCK_TABLE_FULL: textno=ER_LOCK_TABLE_FULL; break; + case HA_ERR_LOCK_DEADLOCK: + textno=ER_LOCK_DEADLOCK; + break; case HA_ERR_READ_ONLY_TRANSACTION: textno=ER_READ_ONLY_TRANSACTION; break; |