From: magnus.blaudd
Date: June 1 2011 6:37am
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3350)
List-Archive: http://lists.mysql.com/commits/138484
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3427313883045953385=="

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

#At file:///data0/magnus/mysql/5.5-telco-7.0/ based on revid:martin.skold@stripped

 3350 magnus.blaudd@stripped	2011-06-01
      ndb
       - revert commenting of DBUG_ASSERT

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-05-30 21:13:02 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-06-01 06:37:15 +0000
@@ -2056,7 +2056,7 @@ end:
         {
           sql_print_error("NDB %s: distributing %s timed out. Ignoring...",
                           type_str, ndb_schema_object->key);
-          // DBUG_ASSERT(false);
+          DBUG_ASSERT(false);
           break;
         }
         if (opt_ndb_extra_logging)


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   1qoj2rffkqs4yk31
# target_branch: file:///data0/magnus/mysql/5.5-telco-7.0/
# testament_sha1: 581ca8debc1fc280ebc13c000578ebf50bdca31a
# timestamp: 2011-06-01 08:38:01 +0200
# base_revision_id: martin.skold@stripped\
#   qsvbaqchmvmqpugg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWePTz+gAAWxfgAEQUGP//3aA
HgC////wUAN08DmNQACSSNJppkNTMiG1AwT0aJk2piMhFPKaCZGDUzUNNBiZGBPUyZADUyap5Jga
j1NHqAAAAAAGAAAAA0AAAAACSRNGgNIeghoJPU02lAA2iATyIRS4BziXQQLUfSABLriQZgxNOqE0
L9CBEQTapkZgSVzMOshs4dt8v1zd6sFFE+G/gm0jmFkouvdSK+WiHltVJlycvMMuWX3xOOiWCYJ0
pQnaSDHCJmlUGQThDFGPUBzFw4IOGHCvGFRRr09ggn5lT/o6JeiLM5beX1CKRbzPo8FINCUKaimH
AeFnf+l+ZbI+LbBZ4cLiJ4tHps8zS6eDjh4FeOBxJhGqeGt463DiOpfAM/gVkqAYJjtEcRuWftzy
xFGyw0aa2IKNmzzIvHzoWhAcU3BElyYw4cPt3FGVoumufI3EsH7g+/YKZU261KG5wxSWkD1qt5Pi
A8YWo1l1m8hJSKgSaeW5AJEFYs7bqoVpJRRQpcrja9oWDCTmGIsWTtVWRxSMECD1sFLkiCTTxvJH
G2MmESg4wgNRMKEjCK41dZrxXW04lo3uSOo+NhmbkW+XB/Q6jxxzOpmOpvU+KRG1bOMIy2DZGXer
jeSkiLsAWJbJJpX6gv3kRpaku54VbtVY2uuGDsFFxUZ1tSs7moJJse6ix5Vfa4/bn0/cK3MlauMU
j33Tnv7/lCd3Ekqkz1cG9J4PnSw+hc4R5r7gKIPxzLOaPijRCOjiDTxq8aZomLaXyfbdZOJeR/qn
LnRwZZQ11iRRSna3mLeAvb6nM/zajYvLxYf7x8dioVfGg+Q7etpMMDRCL0pnp1OIfB87qA5FJinL
WZjX7podSSccGD0Cx3dc9cYbw7BN3z4ivMj7Cp3hUEBeUZg8K3BJJrA62pMcsOeqxKLKlxKxF58G
w0xQUaeFGA5b6PI3SqojgHkP+C2LAy6ReEdVB52Zd7dRPZPScpT3U3ZLIXYKUKIe1RuS7havDljM
w6qU2ZPISjtRCgNtArRM+gq4hMWgVaCvSOz0Sw7OPcVXPQrW6GUJehEuCOxMcs0sxWUVU4m9ruYN
+ARXr48NHEPkXElciQbssnN+pwa2T1oT6nmvS28YLqwYHMtJZRSgah3jFK9d3g9TRE7BgWFC6jlW
eRZlQRxI/+LuSKcKEhx6ef0A


--===============3427313883045953385==--