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

Automatic merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2011-01-10 23:42:47 +02:00
parent 934c57c77e 505c663a1e
commit 2eaa76b844
26 changed files with 1671 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/handler.cc
View File

@@ -2736,7 +2736,10 @@ void handler::print_error(int error, myf errflag)
textno=ER_DUP_UNIQUE;
break;
case HA_ERR_RECORD_CHANGED:
SET_FATAL_ERROR;
/*
This is not fatal error when using HANDLER interface
SET_FATAL_ERROR;
*/
textno=ER_CHECKREAD;
break;
case HA_ERR_CRASHED: