From: Martin Zaun
Date: February 22 2011 10:27pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4107 to 4108)
List-Archive: http://lists.mysql.com/commits/131902
Message-Id: <201102222229.p1MEuFoY010764@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7219243636453911312=="

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

 4108 Martin Zaun	2011-02-22 [merge]
      merge from 7.0 to 7.1

 4107 Martin Zaun	2011-02-22 [merge]
      merge from 7.0 to 7.1

    added:
      mysql-test/include/execute_with_statistics.inc
    modified:
      mysql-test/r/greedy_optimizer.result
      mysql-test/t/greedy_optimizer.test
      storage/ndb/src/kernel/vm/LongSignal.cpp
      storage/ndb/src/kernel/vm/TransporterCallback.cpp
      storage/ndb/src/mgmsrv/ConfigManager.cpp
      storage/ndb/src/mgmsrv/ConfigManager.hpp
      storage/ndb/test/ndbapi/testMgm.cpp

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.1/
# testament_sha1: 50367646ccfa1e19fec438fa7470eefa9afb2478
# timestamp: 2011-02-22 14:27:43 -0800
# source_branch: file:///Users/mz/mysql/ndb-7.1-ndb_restore-test-\
#   cleanup/
# base_revision_id: martin.zaun@stripped\
#   g94nuunp9x7a5tza
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYc05OoAAs7fgFAQUGP/91IC
ABC////wUARzwKUAoAAY0NDQAZDQAAAAAZSaYptU/Jpqn6U/TST1DT1Mg8poPUAY0NDQAZDQAAAA
AxoaGgAyGgAAAAAikQ0aTJo0CMk9BTNTagNGmRwAOB9foaDzEVgUqM6TjaQa1mosLOI56HZOIUD7
RqYDd+nUasZtvLflB5FuFEnLHMuBJvPMiRKjQCfg8mTgvsGbzef6WxrBg7MbkAxEC+IiND2uZZvV
AJnWBWu3P592+utuHldhAFV0nPSW9ta/wy0UgDs7ZzFfsOzoz2ryxFfi+DW6x04tXFtP0RyaT12a
s67h4ce7sb9HHaua1livHzo2WMQ20043/1H6tQ7NQGpwx6NBW0bV33cbFHNgBhRvsbndi+ONtZct
jeMqSXG4v3aPZfwJc79MCq1KDACmPSp8t8XCLdj0AX3GVjYgwSGVwaujUbplFbwskNope47r8d5n
nY8FucFrTKaza7ZT8Xq7Gkx4MjbRW3cGGz8LdPlmVzK542Oxe+VXxZT38J26aAYvOFJIXRbjMwAj
9m66uXCSEXPZa2swvQ1SqnnyNQ9XNd+7DLNeO9003uDywrc6Z5SZzcNGWcRZR9nzcrHaF07p5Sdd
jP7vXlhvuedNzuHJaT7tO3dtnoyDBijuZuxi0BsiujYw0YGG1i1vWl7D8Ob9Hk/R93mgHi0hghj7
S9nBtZr0/7tgwM93P8vLk8fK63l4e6AZLn5cq7G1uX69GTffgh93VANFhf+dqAdl/XRNcb8dbPDR
p8ufHv7WxLw2fNq93ZffjcHjph14LnnU3U9DD87+7w4wwgG36oBxeT/YbM+fm9LDnrk5LmF2vSo4
WuJe+M0ujprxywuyjn8nF3+55+6ABL41zXaHpUpQdGULMTE8SjcTyhBnCxGbkqsyDcjHdvtsaRLx
fUKU0q3+O2Yacv8Zj0aoQPls5O57+T5M2yGgknos2Orl2x7WRGtrNtirdy9w9GCHi+ztKiR3DV+T
NjgN9nd4vZfV8HoFcGNHN/LDa72gSHfAIVWv3/DozckOyHZ4Xvq2HGIYDgu5bX7N66A1QqyBwED+
w6ZP1eoUfdQKu4fwf1ISRKQSJS4PVdWY4DR8V8mrm3N2TDYwgEPw0bEAm3Nq9Sjda2SbnUGcDT0Z
oenkaho8gQtQ2sw/KAXAUX0khnC5b2j6O/ehY0cnC+1+HJ3b/2D5sgqAnJi1DzweztaPuxbRdeBP
R+jc4ghTIIQvmvm2uXUiIL3wQofSCIIuW1Yi+/oyZPo0a9m12dXAYBDUwAqh6rFkDm/V28HEEOrd
hDgsIbkL13L93zXRf3cV9V+HcFX3WSEluebT+EAmvqHH2CTR4v/i7kinChIQ5pydQA==


--===============7219243636453911312==--