database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge work.mysql.com:/home/bk/mysql

Browse Source 
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
This commit is contained in:
unknown
2001-09-18 04:17:52 +02:00
parent 74bec0517b c91a3df5c3
commit 53e09c9838
15 changed files with 111 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/handler.cc
View File

@@ -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;