From: Frazer Clement
Date: May 29 2012 5:28pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (frazer.clement:4549 to 4550)
List-Archive: http://lists.mysql.com/commits/144009
Message-Id: <201205291728.q4THSdGk004849@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4550 Frazer Clement	2012-05-29 [merge]
      Merge 7.0->7.1

    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
 4549 Craig L Russell	2012-05-24
      Fix SF_OrderBy setting for clusterj

    modified:
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
=== 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:44:16 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-05-29 17:07:42 +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).