From: Frazer Clement
Date: May 29 2012 5:28pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4929 to 4930)
 Bug#14075825
List-Archive: http://lists.mysql.com/commits/144010
X-Bug: 14075825
Message-Id: <201205291728.q4THSd7R003445@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4930 Frazer Clement	2012-05-29
      Bug #14075825 LCP Watchdog : Fragment scan check - use specific error
      
      This patch extends the previous patch implementing the 
      LCP Fragment scan watchdog.
      
      This patch adds a specific ndbd/mtd process return code for the
      LCP Fragment scan watchdog failure scenario.
      
      This can allow external monitoring frameworks to detect this scenario
      at the process execution level and take specific steps. 

    modified:
      storage/ndb/include/mgmapi/ndbd_exit_codes.h
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/error/ndbd_exit_codes.c
 4929 magnus.blaudd@stripped	2012-05-23
      Bug#14106592 DEBUG BUILD CRASH IN NDB_SERIALIZE_COND()
       - Use Item::print to print the value of Item_* to String
       before printing to DBUG log
      - NOTE! 7.2 has one more place which need same fix

    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/t/ndb_condition_pushdown.test
      sql/ha_ndbcluster_cond.cc
=== modified file 'storage/ndb/include/mgmapi/ndbd_exit_codes.h'
--- a/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2012-05-29 17:04:36 +0000
@@ -129,7 +129,7 @@ typedef ndbd_exit_classification_enum nd
 /* TUP 6800-> */
 #define NDBD_EXIT_SR_OUT_OF_DATAMEMORY        6800
 /* LQH 7200-> */
-
+#define NDBD_EXIT_LCP_SCAN_WATCHDOG_FAIL      7200
 
 /* Errorcodes for NDB filesystem */
 #define NDBD_EXIT_AFS_NOPATH                2801

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-05-21 22:27:28 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-05-29 17:04:36 +0000
@@ -23499,7 +23499,7 @@ Dblqh::execDUMP_STATE_ORD(Signal* signal
   {
     CRASH_INSERTION(5075);
 
-    progError(__LINE__, NDBD_EXIT_SYSTEM_ERROR, 
+    progError(__LINE__, NDBD_EXIT_LCP_SCAN_WATCHDOG_FAIL,
               "Please report this as a bug. "
               "Provide as much info as possible, expecially all the "
               "ndb_*_out.log files, Thanks. "

=== modified file 'storage/ndb/src/kernel/error/ndbd_exit_codes.c'
--- a/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2011-10-20 13:01:37 +0000
+++ b/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2012-05-29 17:04:36 +0000
@@ -144,6 +144,10 @@ static const ErrStruct errArray[] =
    {NDBD_EXIT_SR_OUT_OF_DATAMEMORY, XCR,
     "Out of data memory during system restart, please increase DataMemory"},
 
+   /* LQH */
+   {NDBD_EXIT_LCP_SCAN_WATCHDOG_FAIL, XIE,
+    "LCP fragment scan watchdog detected a problem.  Please report a bug."},
+
    /* Ndbfs error messages */
    /* Most codes will have additional info, such as OS error code */
    {NDBD_EXIT_AFS_NOPATH,       XIE, "No file system path"},

No bundle (reason: useless for push emails).