fix merge bug

5096a9d2 · gni@dev3-221.dev.cn.tlan · 8b2a5f66 · 5096a9d2
Commit 5096a9d2 authored Aug 08, 2007 by gni@dev3-221.dev.cn.tlan
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -0

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -246,6 +246,7 @@ static int ndb_to_mysql_error(const NdbError *ndberr)
    - Used by replication to see if the error was temporary
  */
  if (ndberr->status == NdbError::TemporaryError)
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
 			ER_GET_TEMPORARY_ERRMSG, ER(ER_GET_TEMPORARY_ERRMSG),
 			ndberr->code, ndberr->message, "NDB");
  else