fix merge bug
This commit is contained in:
parent
574a51324e
commit
4c453a72b6
@ -246,6 +246,7 @@ 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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user