From: marko.makela
Date: April 21 2010 6:39am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3407)
List-Archive: http://lists.mysql.com/commits/106176
Message-Id: <201004210639.o3L681Z0029582@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0209102264=="

--===============0209102264==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjAyMDE1NTAtY2F4MXh5
d3ZsY2RzaGdmZwoKIDM0MDcgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICByZWNfY29u
dmVydF9kdHVwbGVfdG9fcmVjKCk6IEFkZCBhIGRlYnVnIGNoZWNrLgoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcmVtL3JlbTByZWMuYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3JlbS9yZW0wcmVjLmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9yZW0vcmVtMHJlYy5jCTIwMTAtMDItMjAgMTY6NDU6NDEgKzAwMDAKKysrIGIv
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL3JlbS9yZW0wcmVjLmMJMjAxMC0wNC0yMSAwNjozOToxNiAr
MDAwMApAQCAtMTIxNSwxMSArMTIxNSwyMCBAQCByZWNfY29udmVydF9kdHVwbGVfdG9fcmVjKAog
CQltZW1faGVhcF90KgloZWFwCT0gTlVMTDsKIAkJdWxpbnQJCW9mZnNldHNfW1JFQ19PRkZTX05P
Uk1BTF9TSVpFXTsKIAkJY29uc3QgdWxpbnQqCW9mZnNldHM7CisJCXVsaW50CQlpOwogCQlyZWNf
b2Zmc19pbml0KG9mZnNldHNfKTsKIAogCQlvZmZzZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywg
aW5kZXgsCiAJCQkJCSAgb2Zmc2V0c18sIFVMSU5UX1VOREVGSU5FRCwgJmhlYXApOwogCQl1dF9h
ZChyZWNfdmFsaWRhdGUocmVjLCBvZmZzZXRzKSk7CisJCXV0X2FkKGR0dXBsZV9nZXRfbl9maWVs
ZHMoZHR1cGxlKQorCQkgICAgICA9PSByZWNfb2Zmc19uX2ZpZWxkcyhvZmZzZXRzKSk7CisKKwkJ
Zm9yIChpID0gMDsgaSA8IHJlY19vZmZzX25fZmllbGRzKG9mZnNldHMpOyBpKyspIHsKKwkJCXV0
X2FkKGRmaWVsZF9pc19leHQoZHR1cGxlX2dldF9udGhfZmllbGQoZHR1cGxlLCBpKSkKKwkJCSAg
ICAgID09IHJlY19vZmZzX250aF9leHRlcm4ob2Zmc2V0cywgaSkpOworCQl9CisKIAkJaWYgKFVO
SVZfTElLRUxZX05VTEwoaGVhcCkpIHsKIAkJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CiAJCX0KCg==

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# testament_sha1: 23b0947fb97755b833569d2dba5f61eed226b865
# timestamp: 2010-04-21 09:39:24 +0300
# base_revision_id: marko.makela@stripped\
#   cax1xywvlcdshgfg
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS0aqpwAAcnfgFAwW2///3MC
AAC////6UAQaDxoloVWtmwkkgT1NT9RkYTJNI/TVPNJGhtI2k2o0A5piYAEwATAACYAAmCUCEJqP
RM0amk9DKNPRD9UMDRGmmg5piYAEwATAACYAAmCSSaNAaaEm0TU2JppGaRoBpkyNNMsiSSX0VlFA
t91fPr2H+1822KNw9jGuEsFSavk6HhAwwHQMNGsWoo/OjYUWMzL14+aukmYobhqjsZ0cy43c/vDn
9v7+NZX3jPikaxq/mzujCwt058PdtOt8WPo0sAHX1RIPkOTzr6Oxhb7MYxkRur7dfjgS+Mo6OOWL
aGeCCwMQrUnYFuQuHWnbmk2WKgRwEdto/GTeiueVJuxOdQ2VAhkEAYVJRIIiHEod+JmAsJ3PGnnL
vILk9FbffnkgkLce9oPCCHxvw5u0/RaVJhd3go5tpbDNd05qxye+JOGJ6TH+VmoRgophhUp7eA2w
rWkmnKCQTBq8W8UZlGqmmqQYigGwcdYo34FRIfMgTHucNTz9/gXhlJDjH9Wllh5Wpn56EmfkvtT8
D4BE3lhkaTQHKFNYob3lCscKAxdGwNSsLA7GCREx6Q8oGlGaiWLAqFbPP7rrm0A/nB701brzSPmM
AZjAU4pjLQZlpkMVd7QjwayXNSMcynpIhOupLD5xR8XW/m4F6ic6kd5oz4DVl29XjFRl/Ru3n3xe
bFHZ9SbhC7LAKeqyQilxtWvsMiWEKyLcoTTpqF9KHwjQQreHSYi3E4uwR7bzoNesR6kLyYOYjfqK
Yyi/OLpmQrFyqcF3hFmN5tyORyCD31ccEMOC4LBjRUWA8LigOS5BeGw6jasT2iR2V8Jrn3OEOwET
7Y0UWs4yyK05NWKjjaHrbXIPHWUrBTBKt4l5mygkd5Lr3EDRznVYDwb2F1a+IDoxIv8kjnQ5L8Jk
Uyu+DT5hbSX4qDhlWBpqTT5Why46hxSFZA2C0Kd7L19/cV3/uJTiy3/CJbxTTly/WQtxxzsFsHdA
NFhyxCXFlRjtJa8BZIoMzTMHATzPgEKcdN8ctIE8KwMI3+YpRfQVhUm9twicLUjjYmEXJkausqEO
cMNvqbdKigUFwEMu0RH47zuGRcqcQ3LYaskqjGUVcjJoRQ5T6VlAhW2Xo+G1tFgycyGVL9yRvhGl
b1qSKgNrp0VegioHLocrdr7ai665UyGYKkTtNMN5Uy22JwleWfFdKFF/kdzxQ6p8ao9tU0QtR9MZ
gdIUhGTejI4ounBHwMJQjFZRKANRLqJMTC3+Rj1QazZSZQuXIucrmZqiDjqCcLlWnFDK+SJhtfLJ
6vRW84VBf2Wgdqgwt/nmLBBsUyPqtOlmaXYoCdNUPi3eAp6rq/+LuSKcKEgWjVVOAA==


--===============0209102264==--