From: Ole John Aske
Date: October 6 2010 9:07am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3306)
List-Archive: http://lists.mysql.com/commits/120072
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0296533807=="

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

#At file:///home/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jonas@stripped

 3306 Ole John Aske	2010-10-06
      Test commit from new Ubuntu installation on my laptop - please ignore.

    modified:
      storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp	2010-09-24 07:29:43 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp	2010-10-06 09:07:42 +0000
@@ -67,7 +67,7 @@ class NdbConstOperandImpl;
 class NdbLinkedOperandImpl;
 
 // For debuggging.
-#define TRACE_SERIALIZATION
+//#define TRACE_SERIALIZATION
 
 /** A buffer for holding serialized data.
  *


--===============0296533807==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   k9wbax4eko138siw
# target_branch: file:///home/oleja/mysql/mysql-5.1-telco-7.0-spj-\
#   scan-scan/
# testament_sha1: eca12a90ae6c0205f16c3ebf4a3201fcf8a7b97f
# timestamp: 2010-10-06 11:07:51 +0200
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTvb5rcAAXLfgAAQWGP/93o1
vhC////wUAOdeHns7syANDRIp7RpPSbTVGTGm1HqJpiNMgzQ0GkK9VNpHlGmjymhtJjRMQaABkBk
0CUiMpmEU8ptT9KfqgNMgGmgGQA0ImUjE0Y1NM1NDBDQZMjQNNDTCCSRMgBMmE00RoTJ6U8ao09T
I0/VPUyMSIRpsBg7RGaYFYABxCiTipYVajznERCrwavAoJlhIi7RGGRIrtgg/u0KV2I6wVGAuZnS
ee9oCDBPdfNIeJwQxDdJ2cFhp4Ct6/5DTbrlUeW6FMwEFxAZknZcstJK43wRUNXm56egqGZkDCGy
7rVodXIKIEGFMusCAmgpG2zrCh0Wj1OVgmt5SpB+m4ps7HPkhwMcTodoqPLYvCm/HJX7vlJmT0lG
GlApMyphFwPKtMdz1XNG14PLxrzoLoNsiusbIYUQxxqTgcNRKpi2CsbXU5WF6qE3RGvSU35VwSIw
cWl1Ir+Ep0RZeXQeuTmjyxjBxnLc0MsBKshA0lBCgyCnOcLQgFaWFBwxMAYCVEgSBPYTbBnqyxfl
oxqoGtyYZbS/tnjTgZXlysFRsHoNWvV09vCuYrN5C/iJ0KQlwdZU0H1A8tZ700rQJgJjPMLq2CRr
zGTPVaSSJvLf1XNEAY4ad8NlaunPTLHY26/RXb+VVtVkZbjNaGmXlSRwKA7+IybfHBE7IZzMWMQz
mrcuar3i6/1utRMrPZLxUZRdPO72JF0evcUDKMLYnZStT8eYSynSgxdvMOg/7bJNdGZLLNI8NunK
q+zMopqUFi55ODuUJCjnJQUThSrhR9plNhkWAwBmymqkY7Zx7PWRTJkNEsZDQhWfHkeo2tYh4KNd
JusQFXxWRkq9Ci4YxVFTg9mnC6dP4beBnnXl08fE7DYZfHl833uJrR2Q+6lXC7yo/nXA3hP8gO71
V6s3m3Uw+/0TQ1LstL+1OUSghiiSx/xrhJNiFIdptel5OlesknKOe7mNiLCYDUzDrDrqLjRef9cM
mgGlQbXhuc61fZrkr0nE9+bcJ4pEG4L0Ud05vIkkhIfW1/4UnSVSuSrc9Sstr4hqfHN5JGV/De7N
DMqXLvzrF7rH8/NL0uLhsfGWhCurROukO5tyTkedy4vWY7h3VWsyeQlN+ksFL5z8d9M8weg7gopq
wUkHQRHvpJe1iK2bJK/rGIMqFLTyJJOVcjFGgeonc195kqTFuVHgE1ZvasIauo2Wy8Pcg/0Im8c1
Fuhzmk+JRMnBCINUlqn4Ztvae95B61anI90g0+tJQpNYn0dyXPEVkqw5suIxjBSBGcl/8XckU4UJ
A72+a3A=


--===============0296533807==--