From: marko.makela
Date: April 21 2010 6:41am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3406 to 3407)
List-Archive: http://lists.mysql.com/commits/106178
Message-Id: <201004210641.o3L6478X022193@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0157499503=="

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

IDM0MDcgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICByZWNfY29udmVydF9kdHVwbGVf
dG9fcmVjKCk6IEFkZCBhIGRlYnVnIGNoZWNrLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vcmVtL3JlbTByZWMuYwogMzQwNiBNYXJrbyBNYWtlbGEJMjAxMC0wNC0y
MAogICAgICBidHJfY3VyX29wdGltaXN0aWNfaW5zZXJ0KCk6IFJlbW92ZSB1bnVzZWQgdmFyaWFi
bGUgImhlYXAiLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRy
L2J0cjBjdXIuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3JlbS9y
ZW0wcmVjLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yZW0vcmVtMHJlYy5jCTIwMTAt
MDItMjAgMTY6NDU6NDEgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3JlbS9yZW0w
cmVjLmMJMjAxMC0wNC0yMSAwNjozOToxNiArMDAwMApAQCAtMTIxNSwxMSArMTIxNSwyMCBAQCBy
ZWNfY29udmVydF9kdHVwbGVfdG9fcmVjKAogCQltZW1faGVhcF90KgloZWFwCT0gTlVMTDsKIAkJ
dWxpbnQJCW9mZnNldHNfW1JFQ19PRkZTX05PUk1BTF9TSVpFXTsKIAkJY29uc3QgdWxpbnQqCW9m
ZnNldHM7CisJCXVsaW50CQlpOwogCQlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsKIAogCQlvZmZz
ZXRzID0gcmVjX2dldF9vZmZzZXRzKHJlYywgaW5kZXgsCiAJCQkJCSAgb2Zmc2V0c18sIFVMSU5U
X1VOREVGSU5FRCwgJmhlYXApOwogCQl1dF9hZChyZWNfdmFsaWRhdGUocmVjLCBvZmZzZXRzKSk7
CisJCXV0X2FkKGR0dXBsZV9nZXRfbl9maWVsZHMoZHR1cGxlKQorCQkgICAgICA9PSByZWNfb2Zm
c19uX2ZpZWxkcyhvZmZzZXRzKSk7CisKKwkJZm9yIChpID0gMDsgaSA8IHJlY19vZmZzX25fZmll
bGRzKG9mZnNldHMpOyBpKyspIHsKKwkJCXV0X2FkKGRmaWVsZF9pc19leHQoZHR1cGxlX2dldF9u
dGhfZmllbGQoZHR1cGxlLCBpKSkKKwkJCSAgICAgID09IHJlY19vZmZzX250aF9leHRlcm4ob2Zm
c2V0cywgaSkpOworCQl9CisKIAkJaWYgKFVOSVZfTElLRUxZX05VTEwoaGVhcCkpIHsKIAkJCW1l
bV9oZWFwX2ZyZWUoaGVhcCk7CiAJCX0KCg==

--===============0157499503==
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:41:10 +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==


--===============0157499503==--