bzr push into mysql-5.1-telco-7.0 branch (jonas:3190 to 3191) Bug#48517

[Jonas Oreland]

 3191 Jonas Oreland	2009-11-04
      ndb - bug#48517 - fix proper error message when failing to commit schema trans during initial start

    modified:
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
 3190 Pekka Nousiainen	2009-11-03
      bug#48498 01_ddsr.diff
      DBLQH proxy START_RECREQ: pass lowest lcpId to LGMAN

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
=== modified file 'storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-10-14 11:44:05 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-11-04 10:13:35 +0000
@@ -2104,6 +2104,13 @@ void Ndbcntr::execSCHEMA_TRANS_END_CONF(
 
 void Ndbcntr::execSCHEMA_TRANS_END_REF(Signal* signal)
 {
+  jamEntry();
+  SchemaTransEndRef * ref = (SchemaTransEndRef*)signal->getDataPtr();
+  char buf[256];
+  BaseString::snprintf(buf, sizeof(buf), 
+                       "Failed to commit schema trans, err: %u",
+                       ref->errorCode);
+  progError(__LINE__, NDBD_EXIT_INVALID_CONFIG, buf);
   ndbrequire(false);
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]