From: Frazer Clement
Date: June 17 2011 5:20pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (frazer.clement:4466)
List-Archive: http://lists.mysql.com/commits/139430
Message-Id: <201106171720.p5HHKVBf019335@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9071271832040935816=="

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

#At file:///home/frazer/bzr/mysql-5.1-telco-7.0/ based on revid:martin.skold@stripped

 4466 Frazer Clement	2011-06-17
      WL5353 Primary Cluster Conflict Resolution
        Fix bug in refactoring patch - violation count is now 64bit.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-17 09:13:52 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-17 17:20:22 +0000
@@ -601,9 +601,9 @@ SHOW_VAR ndb_status_variables_dynamic[]=
 };
 
 SHOW_VAR ndb_status_conflict_variables[]= {
-  {"fn_max",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX], SHOW_LONG},
-  {"fn_old",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_OLD], SHOW_LONG},
-  {"fn_max_del_win", (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX_DEL_WIN], SHOW_LONG},
+  {"fn_max",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX], SHOW_LONGLONG},
+  {"fn_old",       (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_OLD], SHOW_LONGLONG},
+  {"fn_max_del_win", (char*) &g_ndb_slave_state.total_violation_count[CFT_NDB_MAX_DEL_WIN], SHOW_LONGLONG},
   {NullS, NullS, SHOW_LONG}
 };
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: frazer.clement@stripped\
#   emn0398dv1o88aru
# target_branch: file:///home/frazer/bzr/mysql-5.1-telco-7.0/
# testament_sha1: b03f80d85194aacd60346c2e21484e4220b68117
# timestamp: 2011-06-17 18:20:25 +0100
# base_revision_id: martin.skold@stripped\
#   nhaxgk3o756n6t0w
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcSuR6IAAaffgAgQUXf/93/n
3Mq////6UAQNPc6rbzXujnau94JJJG0TJiZTxNKfpNqnp6ptTNQANB6T1NAxMglJNFNtMhqemoaR
6QNAaAAAAAGgyQGkgaPUCNPU000AAABoaDQ0A2pIT0E9IRp6ENNA0GhoAADQPUZAkoBGpknlDNFP
QEeU/VPUzSeiMNBDQYQOK7szcdH8LNP4siLC2m6gC57mzM51AoyAHp0f2q6vIyILOYaHRrusuan0
9zYaNKU23WjpsenvLP7LP7sMdJgG1ZOrVbbVr11US9Cy+CciVczM0XOqV4qldihoO4R3HPyC7TRq
tWOJrt5o92N8FYifaIzzJyqdLBfkFK12YkncIyh5midMUDbLFIgMEWaHtgD15GTaxzIapG4rUOzf
KtKHsEMJblpEJF4SyWTfY3mXFIC5/yiDUbiEL4jCFNNl1c+aItQ6StUZBn8JnLhLlZgSAlAi2zWx
HxmB7Fti86h7IYHyw14FoxCIa0TetAOAQg8YxVcwmUUMj9cixZIWQkfixl4jNdkMkrCYxkTUlz8I
2BF88tGCxbTnwSeHXDUZ3gwPgaWzAcjXtFY1FgIYodfD4UuyKHXkaOTXTRqi5HgG0CipRWMvOcjp
jQykMC3sFqmQyjS+I7CKdU68gpCgY81VdBaXPwUjbCkVBVSytesTxxoLJyr2oqxWwKND1aUikAoC
wTovplWepNiDH2YMUZKGZPnYZeR55yk+DRjlf7FjI9H4Z1XOfRBwokVugisoFWR2XlaulNvQrRkW
ganCZmmqE5e5kHYe+JyKS5QzkFex7tJpIM1mjmmylbNc+jrEOrscFi2bbotOgmFxnKhnsonjtQGV
gwTJLmudN0gxVuSb2VLAe6yIj958ly9TV23dqicwh6WxXOSKdG9PfO/ZVy1j2Ji4pS4xM3AyD61a
oL24waCRdKYsuZ9xjMuzayihlEgOCkxwMCa+uhjhjp8s+LZ/64vqqA4CskZJuRMrYQZJ7Owvv8Iy
IIV9xxBaptNJYXZLyUz9+3HV0cU6A3cTIM5+0dsf3rcj1qfppV4Z8CBRqTsNdSZWXkO2Pemh2k6k
4uL2q8Koastj/eEjdTEziMDw1Z9kdydxyqOIIqwvWQHBS0N9M5gemtDRgEMPs1LLLF7ZxiqEh7Wy
aBSp7KSkkVqEsiNl71M2exMzJmGmRu85EKgvuzPDOKAcYBlrLJqNDAMmB7JlJTPSt4ooQm2F+VIj
Ev7LflV5CxCpOJyKp0sZcgQVWszDRp96ezJDHSZlgPtNQMhSCWGFKU8KJcID0kerxk6Rlo+OmFK2
DFAcgRhwqGrdjSVoUBOkxPA0x4uRF4w4POsA1Cm/pqKttOImlRDARSwJQXUsIWmbI2dmWsUj5QmF
mFXJkWK1qN8oyOrfbWGDaRpoFhVStxLGFZPk1qFtKIEkSC4zjiEWAMbNeK/4u5IpwoSGJXI9EA==


--===============9071271832040935816==--