From: magnus.blaudd
Date: June 22 2011 7:57am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4477)
List-Archive: http://lists.mysql.com/commits/139645
Message-Id: <20110622075745.603AA134016@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0955506728410446203=="

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

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4477 magnus.blaudd@stripped	2011-06-22
      ndb -remove junk comment

    modified:
      storage/ndb/tools/ndb_dump_frm_data.cpp
=== modified file 'storage/ndb/tools/ndb_dump_frm_data.cpp'
--- a/storage/ndb/tools/ndb_dump_frm_data.cpp	2011-06-14 10:42:04 +0000
+++ b/storage/ndb/tools/ndb_dump_frm_data.cpp	2011-06-22 07:57:40 +0000
@@ -20,7 +20,6 @@
 #include <NdbApi.hpp>
 #include <NDBT.hpp>
 
-// UNUSED static int oi = 1000;
 static struct my_option
 my_long_options[] =
 {


--===============0955506728410446203==
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\
#   8oxyxnh04sqpt752
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: a1da8cc0979cad5f7de89e80551eea0157e760f5
# timestamp: 2011-06-22 09:57:45 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   hvfb7u7uoohje1ng
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSY2udkAAWDfgAAQUGP/91IA
AAC///9wUAM3d52i7r2l2eeEkkU/U2hJ6YjTRhEw1NPUDASSIZMIAibKI9Q0ekAASUMQppoh6nqY
hkAGgAEkplPSNop+k9U09NT1B6I9Jg0QBJJE8jQUeNRqbU9NJkyHqGgK7ntVPqsJPgWsjMbPNz4+
dfTVmY9vU/NkKOxbysZ3j5N+5Os7MiFWb3Ot3lDCwxVJmI26Rd9a8tnWsjOd9RUIySOIVws12Fsx
1Cp1OhND0pLULGgJtroLuJydMrW5+JsrRwWXSmgFUdjbpYCdM8vImzP4lXioamdV1ncWy46GBXF+
GMrkx6VjOKRt8wKiT0GBAzHIGxlrDpAvJxjYGfb8GMmwnCEOJqvx3ljK4XL5g6iLjZaKs77TK9DW
UIzqKY1p4q5ExW5MyLblGApk4Wvu5IkJdI1kojILTjLeuGYMUJay4e7HmvO1qmLddxPFhwdS4fkt
ilp1X7WF5krMKUtnCm1+xcQv7C85my16VNe3UdZA8vRaYNkOhnSNKuK5NcwSvMm1E84kxYKvLxN2
23dsKS4cWoIq4SPifkutXql8WRwycQZZODXbPc7+81ZwSLLKESEZFsn46UPJJuAjjNWSOatnDQaM
nOH9RFHXIIER8d1+FTMkRSPiNCp967ovMSqKgmoVojunI1fMhEvGXoXk2cyt8MCqy7pt7Xxq4zOM
e7DizpoI5bY83m6Tn2gxfj4RubLvcdIMTYpyhpZLlXnSUA9Ouvpo1Ija8bVCDFZXzoP/plsYm5Lk
6gsf0ZkMwjz+cIxNYEmSl1mhfNBcYwwJ9FKZ8C1OK8wqn72VRe4bLg4RZZLS7TVaUVhtRSEN0wew
jOhIYlC6GVLCN6kuxyGcTLzi/N9JOhrfBQQ6eWUMD6MDlq5guAt+n3xFEl6CJrGmUNiFGHWC3vPC
Q5EixcoY4W9RP0kV+ECJXb2ZOGm7a5ZaX+RTi2mFkFZOAanvRDhqJL7FBVxU+1nLL36CIZ3U+GLi
cNAdE9Wv7/YU8mkE2150E52g5Sc+eppdr7pHGk0SW41zLbseF361EQrvYvEFSYiAyrVwNjmLs9QF
WrjaKUzApn/i7kinChIExtc7IA==


--===============0955506728410446203==--