summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-18 04:58:15 +0300
committermonty@hundin.mysql.fi <>2001-09-18 04:58:15 +0300
commitcd78a8be66a18300e8bf48813adc2548ad7552c7 (patch)
tree4ac99859c8cc85b07cbaadfa18dc36026c886644 /sql/handler.cc
parentdb61a3456e89d3afeb9494b4ef9185435bc55b86 (diff)
downloadmariadb-git-cd78a8be66a18300e8bf48813adc2548ad7552c7.tar.gz
Fix for LOAD DATA FROM MASTER when using tables with checksum
Fixed some wrong test cases
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc3
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;