From: Pekka Nousiainen
Date: May 30 2011 8:22am
Subject: bzr commit into mysql-5.1-telco-7.0-wl4124-new0 branch
 (pekka.nousiainen:4386) WL#4124
List-Archive: http://lists.mysql.com/commits/138412
Message-Id: <20110530082214.CC7695586A@sama.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0308958192=="

--===============0308958192==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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


--===============0308958192==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/pekka.nousiainen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pekka.nousiainen@stripped\
#   qm5ms31q6cae3je7
# target_branch: file:///export/space/pekka/ms/ms-wl4124-70/
# testament_sha1: f83e44227d1e597e16bb0cdf90545c040945a124
# timestamp: 2011-05-30 11:22:14 +0300
# base_revision_id: pekka.nousiainen@stripped\
#   yiu90cy580tmn51s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXTRCBEAAhLfgEAQWWP//1aD
TQC////wUAS63d3emtc7gRHtsmEkpk0IyaNKb09U9U8aaUekzU9TTaNI2jTUCUkYJpoGoyNGo0NN
NAAAABJEmFJ6nlGelDammgAAAAACSRNNU8mU9T9UNhTahppkAGhoNABJJMgACaaNGkMkzKPU9QGg
Bpaq1x2rHPPp95E8+CM77NbwXdGkpzJQsftvcyzbMdhEZmZl68Uc3zUyMxe19UsjhxPx8tkHHLr2
/zMe7EGS742uy+B35c5K6EmUiEdBw0kA+UEsgX075jDTkbM7Wgft0olupVxhcJbjDG3FCxuUq4mB
kW1p0iqQ56eyxVgdaQ4/E7oUWpo44FAxCSFCWR6SUWAkDD8JKh4SqiggmID5IfFCqROyhiGAx4cf
29C3Yl0zngWIItkpEdzZLZKqtYaQZObaZXq7q02yF5ygmLNTgfWSASBdE4aJjwC1kKtVJ5iBkBqp
JgaQnpnOAZZhJwjmm8tHQI5iZEHrfWcYElkm8g3WQNCh70q3EgMsOV1pKKpgsA7MmLC41NcFxlbV
G6BAvppeWLEfW+4ujNNqpyZ9qc8c4ZInzZIpaE0Skvho4jWBhQGzGx0MZ4LzqpuuZW2X3jRB9FmY
JANCnMm2tXheUFTEIjgwWYDEz9sdOy0Yoe8ohGVaiSwYwbXAYP0wdhFGCrgUCXrSOUnvtK56n2qL
SsHh+J9tFpgPBys8qGY1SJhdlhVldfCTRudTnAJIZ5tJRROTWU6ledEAyGgzI2OY3cIoWpRhhmOX
r7Qf005D8zVZd3TZTvITdKtZZUOMBkpze8NxL864/MSkFMaHIoJiUko9WwYbgdsULyJ5wHc7YC9w
l4NcUvv7qUpCDnNwyIew2Gm9sBzsiIMExAsJQ7iyXik81k5rMDvsOYh/TXXlQ3oOQsi8PgJXMLvU
Vzcy3DfoSEbqqwiJpAqHwR7Ry8mMR58Y7Lk+/GXgbxhBWbMHUAOhV7OpvtS1tLibvE5FWmadcqku
p32cOMsBouF2LGUy/28ScRUV0NJ93EADkvVMGJut7HV+Cr2ROv+xooOTIljEMC07r+XjCUkaQlmT
81YdTWbzt94uOBH5zC/rZz7nBqxSaKG8CwoNEbEYTHA50iWotxeSH4On+waRTOMcYo0CVeXrptfW
jciG1ZwvIHXHPICMuMDcQmL0lhsI2RIgJCom1d0M2B1qOxOXQOjB2ORUhOThmKMuniQHE2KExYA6
W1TGcSn2x6KOMPAD1ltkJVYXxD0JtDaZlMyM1oIklMkns8hgTeSFeVCYiw4HLRcU67JiKSgjnZ3E
52IUUZLjEsHrP6RQu+UV1ortLDA1HElTw/R6Jh3RqrLzcVbBcZOfj2Ad9MNgGspzOOuwI3SSCqgn
Sr6L1Rpo92KTiZQT4ZbTt4YE8XahygYoGOmDSjepW5XKwwEn6UPKQ8NZnM7M1k5W5M7IJikz0Yg4
7A65D4qmNwa8nwynpOqnRSqGKtQ5VSuDV1ZYviN3lmU2CUy1Jc4nQurqD39Y0VljL5Y+a4zrEZsZ
7WbWVEFvtHFfj/xdyRThQkHTRCBE


--===============0308958192==--