diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-18 04:58:15 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-18 04:58:15 +0300 |
| commit | c91a3df5c38ee5f4ebc7e42f0c17da79d4930801 (patch) | |
| tree | 4ac99859c8cc85b07cbaadfa18dc36026c886644 /sql/handler.cc | |
| parent | 9d62e4a05b1c8399787b624a90e0cab0aa42c57c (diff) | |
| download | mariadb-git-c91a3df5c38ee5f4ebc7e42f0c17da79d4930801.tar.gz | |
Fix for LOAD DATA FROM MASTER when using tables with checksum
Fixed some wrong test cases
Docs/manual.texi:
Changelog
extra/perror.c:
Added BDB table errors
include/myisam.h:
Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
Better logging
mysql-test/r/join.result:
Fixed missing results
mysql-test/r/rpl000006.result:
Updated result
mysql-test/t/join.test:
Fixed wrong test
mysql-test/t/rpl000001.test:
Fixed wrong test
mysql-test/t/rpl000006.test:
Cleanup
mysql-test/t/rpl000017-slave.sh:
Fixed too long password
mysql-test/t/rpl000017.test:
Fixed too long password
sql/ha_myisam.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
Unique error for DEADLOCK
sql/slave.cc:
Fix for LOAD DATA FROM MASTER when using tables with checksum
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 1c50634de1f..0a415040d82 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; |