1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj

Browse Source 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423
This commit is contained in:
unknown 2007-08-08 19:10:15 +08:00
commit 574a51324e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/ha_ndbcluster.cc
View File

@ -229,14 +229,12 @@ static int ndb_to_mysql_error(const NdbError *ndberr)
*/ */
case HA_ERR_NO_SUCH_TABLE: case HA_ERR_NO_SUCH_TABLE:
case HA_ERR_KEY_NOT_FOUND: case HA_ERR_KEY_NOT_FOUND:
case HA_ERR_FOUND_DUPP_KEY:
return error; return error;
/* Mapping missing, go with the ndb error code*/ /* Mapping missing, go with the ndb error code*/
case -1: case -1:
error= ndberr->code; error= ndberr->code;
break; break;
/* Mapping exists, go with the mapped code */ /* Mapping exists, go with the mapped code */
default: default:
break; break;
@ -248,7 +246,6 @@ static int ndb_to_mysql_error(const NdbError *ndberr)
- Used by replication to see if the error was temporary - Used by replication to see if the error was temporary
*/ */
if (ndberr->status == NdbError::TemporaryError) if (ndberr->status == NdbError::TemporaryError)
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
ER_GET_TEMPORARY_ERRMSG, ER(ER_GET_TEMPORARY_ERRMSG), ER_GET_TEMPORARY_ERRMSG, ER(ER_GET_TEMPORARY_ERRMSG),
ndberr->code, ndberr->message, "NDB"); ndberr->code, ndberr->message, "NDB");
else else