bzr commit into mysql-5.1-telco-7.0-wl4124-new0 branch (pekka.nousiainen:4386) WL#4124

[Pekka Nousiainen]

#At file:///export/space/pekka/ms/ms-wl4124-70/ based on revid:pekka.nousiainen@stripped

 4386 Pekka Nousiainen	2011-05-30
      wl#4124 d02_systab.diff
      minimal kernel-side patch

    modified:
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
      storage/ndb/src/kernel/blocks/trix/Trix.cpp
=== modified file 'storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp	2011-05-19 09:16:32 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp	2011-05-30 08:22:11 +0000
@@ -204,9 +204,7 @@ Ndbcntr::g_sysTable_NDBIS_SAMPLE = {
 const Ndbcntr::SysTable*
 Ndbcntr::g_sysTableList[] = {
   &g_sysTable_SYSTAB_0,
-  &g_sysTable_NDBEVENTS_0,
-  &g_sysTable_NDBIS_HEAD,
-  &g_sysTable_NDBIS_SAMPLE
+  &g_sysTable_NDBEVENTS_0
 };
 
 //TODO Backup needs this info to allocate appropriate number of records

=== modified file 'storage/ndb/src/kernel/blocks/trix/Trix.cpp'
--- a/storage/ndb/src/kernel/blocks/trix/Trix.cpp	2011-05-25 15:03:11 +0000
+++ b/storage/ndb/src/kernel/blocks/trix/Trix.cpp	2011-05-30 08:22:11 +0000
@@ -1849,7 +1849,7 @@ Trix::statGetMetaDone(Signal* signal, St
   SubscriptionRecord* subRec = c_theSubscriptions.getPtr(stat.m_subRecPtrI);
   D("statGetMetaDone" << V(stat));
 
-  c_statGetMetaDone = true;
+  // c_statGetMetaDone = true;
 
   subRec->requestType = STAT_UTIL;
   // fill in constant part


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