Skip to content

M
mariadb
Commit 4c453a72 authored by unknown's avatar unknown
Browse files
Options

fix merge bug

parent 574a5132
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
sql/ha_ndbcluster.cc
View file @ 4c453a72
...@@ -246,6 +246,7 @@ static int ndb_to_mysql_error(const NdbError *ndberr) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7