From 4c453a72b6cefb83bc014b8ddba729448e6db4b6 Mon Sep 17 00:00:00 2001
From: unknown <gni@dev3-221.dev.cn.tlan>
Date: Wed, 8 Aug 2007 19:23:12 +0800
Subject: [PATCH] fix merge bug

---
 sql/ha_ndbcluster.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index d3b6163ae72..07d5c8ffea0 100644
--- 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