From: Magnus BlĂ„udd Date: April 15 2010 11:38am Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3498) Bug#37267 Bug#44344 List-Archive: http://lists.mysql.com/commits/105724 X-Bug: 37267,44344 Message-Id: <20100415113815.80168134042@pilot> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_xy47bhhcC/pgpxBM5BruzA)" --Boundary_(ID_xy47bhhcC/pgpxBM5BruzA) MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-transfer-encoding: BASE64 Content-disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tc3ZlbnNzb24vbXlzcWwvNy4wLXN0Yi1idWc0NDM0 NC8gYmFzZWQgb24gcmV2aWQ6bWFnbnVzLmJsYXVkZEBzdW4uY29tLTIwMTAwNDEz MTcyNDUwLTMxaDRjbWt5Y2dxejhsaTkNCg0KIDM0OTggTWFnbnVzIEJsw6V1ZGQJ MjAxMC0wNC0xNQ0KICAgICAgQnVnIzQ0MzQ0ICBCYWNrcG9ydCBCVUcjMzcyNjcg Y29ubmVjdCgpIEVJTlBST0dSRVNTIGZhaWx1cmVzIG1pc2hhbmRsZWQgaW4gY2xp ZW50IGxpYnJhcnkNCiAgICAgIC0gYmFja3BvcnQgb2YgcGF0Y2ggZm9yIGJ1ZyMz NzI2NyB0byBmaXggcHJvYmxlbSBpbiAnbXlzcWxfcmVhbF9jb25uZWN0Jw0KICAg ICAgICB3aGljaCBkaWRuJ3QgYWx3YXlzIHRyeSBjb25uZWN0aW5nIHRocm91Z2gg YWxsIHRoZSBhZGRyZXNzZXMNCiAgICAgICAgcmV0dXJuZWQgZnJvbSAnZ2V0YWRk cmluZm8nDQoNCiAgICBtb2RpZmllZDoNCiAgICAgIGxpYm15c3FsZC9saWJteXNx bGQuYw0KICAgICAgbXlzcWwtdGVzdC9pbmNsdWRlL3dhaXRfZm9yX3NsYXZlX3Bh cmFtLmluYw0KICAgICAgc3FsLWNvbW1vbi9jbGllbnQuYw0KPT09IG1vZGlmaWVk IGZpbGUgJ2xpYm15c3FsZC9saWJteXNxbGQuYycNCi0tLSBhL2xpYm15c3FsZC9s aWJteXNxbGQuYwkyMDA5LTEyLTE4IDA2OjQzOjA0ICswMDAwDQorKysgYi9saWJt eXNxbGQvbGlibXlzcWxkLmMJMjAxMC0wNC0xNSAxMTozODoxMCArMDAwMA0KQEAg LTEwMCw3ICsxMDAsNyBAQCBteXNxbF9yZWFsX2Nvbm5lY3QoTVlTUUwgKm15c3Fs LGNvbnN0IGNoDQogICBjaGFyIG5hbWVfYnVmZltVU0VSTkFNRV9MRU5HVEhdOw0K IA0KICAgREJVR19FTlRFUigibXlzcWxfcmVhbF9jb25uZWN0Iik7DQotICBEQlVH X1BSSU5UKCJlbnRlciIsKCJob3N0OiAlcyAgZGI6ICVzICB1c2VyOiAlcyIsDQor ICBEQlVHX1BSSU5UKCJlbnRlciIsKCJob3N0OiAlcyAgZGI6ICVzICB1c2VyOiAl cyAobGlibXlzcWxkKSIsDQogCQkgICAgICBob3N0ID8gaG9zdCA6ICIoTnVsbCki LA0KIAkJICAgICAgZGIgPyBkYiA6ICIoTnVsbCkiLA0KIAkJICAgICAgdXNlciA/ IHVzZXIgOiAiKE51bGwpIikpOw0KDQo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwt dGVzdC9pbmNsdWRlL3dhaXRfZm9yX3NsYXZlX3BhcmFtLmluYycNCi0tLSBhL215 c3FsLXRlc3QvaW5jbHVkZS93YWl0X2Zvcl9zbGF2ZV9wYXJhbS5pbmMJMjAwOS0w MS0wOSAxNDoxMjozMSArMDAwMA0KKysrIGIvbXlzcWwtdGVzdC9pbmNsdWRlL3dh aXRfZm9yX3NsYXZlX3BhcmFtLmluYwkyMDEwLTA0LTE1IDExOjM4OjEwICswMDAw DQpAQCAtNDksNiArNDksOCBAQCBpZiAoISRfc2xhdmVfdGltZW91dF9jb3VudGVy KQ0KIHsNCiAgIGxldCAkX3NsYXZlX3RpbWVvdXRfY291bnRlcj0gMzAwMDsNCiB9 DQorIyBTYXZlIHJlc3VsdGluZyBjb3VudGVyIGZvciBsYXRlciB1c2UuDQorbGV0 ICRzbGF2ZV90Y250PSAkX3NsYXZlX3RpbWVvdXRfY291bnRlcjsNCiANCiBsZXQg JF9zbGF2ZV9wYXJhbV9jb21wYXJpc29uPSAkc2xhdmVfcGFyYW1fY29tcGFyaXNv bjsNCiBpZiAoYFNFTEVDVCAnJF9zbGF2ZV9wYXJhbV9jb21wYXJpc29uJyA9ICcn YCkNCkBAIC03MCw3ICs3Miw3IEBAIHdoaWxlIChgU0VMRUNUIE5PVCgnJF9zaG93 X3NsYXZlX3N0YXR1c18NCiAjIFRoaXMgaGFzIHRvIGJlIG91dHNpZGUgdGhlIGxv b3AgdW50aWwgQlVHIzQxOTEzIGhhcyBiZWVuIGZpeGVkDQogaWYgKCEkX3NsYXZl X3RpbWVvdXRfY291bnRlcikNCiB7DQotICAtLWVjaG8gKioqKiBFUlJPUjogdGlt ZW91dCBhZnRlciAkc2xhdmVfdGltZW91dCBzZWNvbmRzIHdoaWxlIHdhaXRpbmcg Zm9yIHNsYXZlIHBhcmFtZXRlciAkc2xhdmVfcGFyYW0gJF9zbGF2ZV9wYXJhbV9j b21wYXJpc29uICRzbGF2ZV9wYXJhbV92YWx1ZSAqKioqDQorICAtLWVjaG8gKioq KiBFUlJPUjogdGltZW91dCBhZnRlciAkc2xhdmVfdGNudCBkZWNpLXNlY29uZHMg d2hpbGUgd2FpdGluZyBmb3Igc2xhdmUgcGFyYW1ldGVyICRzbGF2ZV9wYXJhbSAk X3NsYXZlX3BhcmFtX2NvbXBhcmlzb24gJHNsYXZlX3BhcmFtX3ZhbHVlICoqKioN CiAgIGlmIChgU0VMRUNUICckc2xhdmVfZXJyb3JfbWVzc2FnZScgIT0gJydgKQ0K ICAgew0KICAgICAtLWVjaG8gTWVzc2FnZTogJHNsYXZlX2Vycm9yX21lc3NhZ2UN Cg0KPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC1jb21tb24vY2xpZW50LmMnDQotLS0g YS9zcWwtY29tbW9uL2NsaWVudC5jCTIwMTAtMDQtMTMgMTY6MDE6MzggKzAwMDAN CisrKyBiL3NxbC1jb21tb24vY2xpZW50LmMJMjAxMC0wNC0xNSAxMTozODoxMCAr MDAwMA0KQEAgLTE0Nyw5ICsxNDcsMTIgQEAgaW50IG15X2Nvbm5lY3QobXlfc29j a2V0IGZkLCBjb25zdCBzdHJ1Yw0KIAkgICAgICAgdWludCB0aW1lb3V0KQ0KIHsN CiAjaWYgZGVmaW5lZChfX1dJTl9fKSB8fCBkZWZpbmVkKF9fTkVUV0FSRV9fKQ0K LSAgcmV0dXJuIGNvbm5lY3QoZmQsIChzdHJ1Y3Qgc29ja2FkZHIqKSBuYW1lLCBu YW1lbGVuKTsNCisgIERCVUdfRU5URVIoIm15X2Nvbm5lY3QiKTsNCisgIERCVUdf UkVUVVJOKGNvbm5lY3QoZmQsIChzdHJ1Y3Qgc29ja2FkZHIqKSBuYW1lLCBuYW1l bGVuKSk7DQogI2Vsc2UNCiAgIGludCBmbGFncywgcmVzLCBzX2VycjsNCisgIERC VUdfRU5URVIoIm15X2Nvbm5lY3QiKTsNCisgIERCVUdfUFJJTlQoImVudGVyIiwg KCJmZDogJWQgIHRpbWVvdXQ6ICV1IiwgZmQsIHRpbWVvdXQpKTsNCiANCiAgIC8q DQogICAgIElmIHRoZXkgcGFzc2VkIHVzIGEgdGltZW91dCBvZiB6ZXJvLCB3ZSBz aG91bGQgYmVoYXZlDQpAQCAtMTU3LDI0ICsxNjAsMjYgQEAgaW50IG15X2Nvbm5l Y3QobXlfc29ja2V0IGZkLCBjb25zdCBzdHJ1Yw0KICAgKi8NCiANCiAgIGlmICh0 aW1lb3V0ID09IDApDQotICAgIHJldHVybiBjb25uZWN0KGZkLCAoc3RydWN0IHNv Y2thZGRyKikgbmFtZSwgbmFtZWxlbik7DQorICAgIERCVUdfUkVUVVJOKGNvbm5l Y3QoZmQsIChzdHJ1Y3Qgc29ja2FkZHIqKSBuYW1lLCBuYW1lbGVuKSk7DQogDQog ICBmbGFncyA9IGZjbnRsKGZkLCBGX0dFVEZMLCAwKTsJICAvKiBTZXQgc29ja2V0 IHRvIG5vdCBibG9jayAqLw0KICNpZmRlZiBPX05PTkJMT0NLDQogICBmY250bChm ZCwgRl9TRVRGTCwgZmxhZ3MgfCBPX05PTkJMT0NLKTsgIC8qIGFuZCBzYXZlIHRo ZSBmbGFncy4uICAqLw0KICNlbmRpZg0KIA0KKyAgREJVR19QUklOVCgiaW5mbyIs ICgiY29ubmVjdGluZyBub24tYmxvY2tpbmciKSk7DQogICByZXM9IGNvbm5lY3Qo ZmQsIChzdHJ1Y3Qgc29ja2FkZHIqKSBuYW1lLCBuYW1lbGVuKTsNCisgIERCVUdf UFJJTlQoImluZm8iLCAoImNvbm5lY3QgcmVzdWx0OiAlZCAgZXJybm86ICVkIiwg cmVzLCBlcnJubykpOw0KICAgc19lcnI9IGVycm5vOwkJCS8qIFNhdmUgdGhlIGVy cm9yLi4uICovDQogICBmY250bChmZCwgRl9TRVRGTCwgZmxhZ3MpOw0KICAgaWYg KChyZXMgIT0gMCkgJiYgKHNfZXJyICE9IEVJTlBST0dSRVNTKSkNCiAgIHsNCiAg ICAgZXJybm89IHNfZXJyOwkJCS8qIFJlc3RvcmUgaXQgKi8NCi0gICAgcmV0dXJu KC0xKTsNCisgICAgREJVR19SRVRVUk4oLTEpOw0KICAgfQ0KICAgaWYgKHJlcyA9 PSAwKQkJCQkvKiBDb25uZWN0ZWQgcXVpY2tseSEgKi8NCi0gICAgcmV0dXJuKDAp Ow0KLSAgcmV0dXJuIHdhaXRfZm9yX2RhdGEoZmQsIHRpbWVvdXQpOw0KKyAgICBE QlVHX1JFVFVSTigwKTsNCisgIERCVUdfUkVUVVJOKHdhaXRfZm9yX2RhdGEoZmQs IHRpbWVvdXQpKTsNCiAjZW5kaWYNCiB9DQogDQpAQCAtMTkzLDI2ICsxOTgsNTgg QEAgc3RhdGljIGludCB3YWl0X2Zvcl9kYXRhKG15X3NvY2tldCBmZCwgdQ0KICNp ZmRlZiBIQVZFX1BPTEwNCiAgIHN0cnVjdCBwb2xsZmQgdWZkczsNCiAgIGludCBy ZXM7DQorICBEQlVHX0VOVEVSKCJ3YWl0X2Zvcl9kYXRhIik7DQogDQorICBEQlVH X1BSSU5UKCJpbmZvIiwgKCJwb2xsaW5nIikpOw0KICAgdWZkcy5mZD0gZmQ7DQog ICB1ZmRzLmV2ZW50cz0gUE9MTElOIHwgUE9MTFBSSTsNCiAgIGlmICghKHJlcz0g cG9sbCgmdWZkcywgMSwgKGludCkgdGltZW91dCoxMDAwKSkpDQogICB7DQorICAg IERCVUdfUFJJTlQoImluZm8iLCAoInBvbGwgdGltZWQgb3V0IikpOw0KICAgICBl cnJubz0gRUlOVFI7DQotICAgIHJldHVybiAtMTsNCisgICAgREJVR19SRVRVUk4o LTEpOw0KICAgfQ0KKyAgREJVR19QUklOVCgiaW5mbyIsDQorICAgICAgICAgICAg ICgicG9sbCByZXN1bHQ6ICVkICBlcnJubzogJWQgIHJldmVudHM6IDB4JTAyZCAg ZXZlbnRzOiAweCUwMmQiLA0KKyAgICAgICAgICAgICAgcmVzLCBlcnJubywgdWZk cy5yZXZlbnRzLCB1ZmRzLmV2ZW50cykpOw0KICAgaWYgKHJlcyA8IDAgfHwgISh1 ZmRzLnJldmVudHMgJiAoUE9MTElOIHwgUE9MTFBSSSkpKQ0KLSAgICByZXR1cm4g LTE7DQotICByZXR1cm4gMDsNCisgICAgREJVR19SRVRVUk4oLTEpOw0KKyAgLyoN CisgICAgQXQgdGhpcyBwb2ludCwgd2Uga25vdyB0aGF0IHNvbWV0aGluZyBoYXBw ZW5lZCBvbiB0aGUgc29ja2V0Lg0KKyAgICBCdXQgdGhpcyBkb2VzIG5vdCBtZWFu cyB0aGF0IGV2ZXJ5dGhpbmcgaXMgYWxyaWdodC4NCisgICAgVGhlIGNvbm5lY3Qg bWlnaHQgaGF2ZSBmYWlsZWQuIFdlIG5lZWQgdG8gcmV0cmlldmUgdGhlIGVycm9y IGNvZGUNCisgICAgZnJvbSB0aGUgc29ja2V0IGxheWVyLiBXZSBtdXN0IHJldHVy biBzdWNjZXNzIG9ubHkgaWYgd2UgYXJlIHN1cmUNCisgICAgdGhhdCBpdCB3YXMg cmVhbGx5IGEgc3VjY2Vzcy4gT3RoZXJ3aXNlIHdlIG1pZ2h0IHByZXZlbnQgdGhl IGNhbGxlcg0KKyAgICBmcm9tIHRyeWluZyBhbm90aGVyIGFkZHJlc3MgdG8gY29u bmVjdCB0by4NCisgICovDQorICB7DQorICAgIGludCAgICAgICAgIHNfZXJyOw0K KyAgICBzb2NrbGVuX3QgICBzX2xlbj0gc2l6ZW9mKHNfZXJyKTsNCisNCisgICAg REJVR19QUklOVCgiaW5mbyIsICgiR2V0IFNPX0VSUk9SIGZyb20gbm9uLWJsb2Nr ZWQgY29ubmVjdGVkIHNvY2tldC4iKSk7DQorICAgIHJlcz0gZ2V0c29ja29wdChm ZCwgU09MX1NPQ0tFVCwgU09fRVJST1IsICZzX2VyciwgJnNfbGVuKTsNCisgICAg REJVR19QUklOVCgiaW5mbyIsICgiZ2V0c29ja29wdCByZXM6ICVkICBzX2Vycjog JWQiLCByZXMsIHNfZXJyKSk7DQorICAgIGlmIChyZXMpDQorICAgICAgREJVR19S RVRVUk4ocmVzKTsNCisgICAgLyogZ2V0c29ja29wdCgpIHdhcyBzdWNjZXNzZnVs LCBjaGVjayB0aGUgcmV0cmlldmVkIHN0YXR1cyB2YWx1ZS4gKi8NCisgICAgaWYg KHNfZXJyKQ0KKyAgICB7DQorICAgICAgZXJybm89IHNfZXJyOw0KKyAgICAgIERC VUdfUkVUVVJOKC0xKTsNCisgICAgfQ0KKyAgICAvKiBTdGF0dXMgZnJvbSBjb25u ZWN0KCkgaXMgemVyby4gU29ja2V0IGlzIHN1Y2Nlc3NmdWxseSBjb25uZWN0ZWQu ICovDQorICB9DQorICBEQlVHX1JFVFVSTigwKTsNCiAjZWxzZQ0KICAgU09DS09Q VF9PUFRMRU5fVFlQRSBzX2Vycl9zaXplID0gc2l6ZW9mKHVpbnQpOw0KICAgZmRf c2V0IHNmZHM7DQogICBzdHJ1Y3QgdGltZXZhbCB0djsNCiAgIHRpbWVfdCBzdGFy dF90aW1lLCBub3dfdGltZTsNCiAgIGludCByZXMsIHNfZXJyOw0KKyAgREJVR19F TlRFUigid2FpdF9mb3JfZGF0YSIpOw0KIA0KICAgaWYgKGZkID49IEZEX1NFVFNJ WkUpCQkJCS8qIENoZWNrIGlmIHdyb25nIGVycm9yICovDQotICAgIHJldHVybiAw OwkJCQkJLyogQ2FuJ3QgdXNlIHRpbWVvdXQgKi8NCisgICAgREJVR19SRVRVUk4o MCk7CQkJCQkvKiBDYW4ndCB1c2UgdGltZW91dCAqLw0KIA0KICAgLyoNCiAgICAg T3VyIGNvbm5lY3Rpb24gaXMgImluIHByb2dyZXNzLiIgIFdlIGNhbiB1c2UgdGhl IHNlbGVjdCgpIGNhbGwgdG8gd2FpdA0KQEAgLTI1MiwxMSArMjg5LDExIEBAIHN0 YXRpYyBpbnQgd2FpdF9mb3JfZGF0YShteV9zb2NrZXQgZmQsIHUNCiAgICAgICBi cmVhazsNCiAjZW5kaWYNCiAgICAgaWYgKHJlcyA9PSAwKQkJCQkJLyogdGltZW91 dCAqLw0KLSAgICAgIHJldHVybiAtMTsNCisgICAgICBEQlVHX1JFVFVSTigtMSk7 DQogICAgIG5vd190aW1lPSBteV90aW1lKDApOw0KICAgICB0aW1lb3V0LT0gKHVp bnQpIChub3dfdGltZSAtIHN0YXJ0X3RpbWUpOw0KICAgICBpZiAoZXJybm8gIT0g RUlOVFIgfHwgKGludCkgdGltZW91dCA8PSAwKQ0KLSAgICAgIHJldHVybiAtMTsN CisgICAgICBEQlVHX1JFVFVSTigtMSk7DQogICB9DQogDQogICAvKg0KQEAgLTI2 NywxNCArMzA0LDE0IEBAIHN0YXRpYyBpbnQgd2FpdF9mb3JfZGF0YShteV9zb2Nr ZXQgZmQsIHUNCiANCiAgIHNfZXJyPTA7DQogICBpZiAoZ2V0c29ja29wdChmZCwg U09MX1NPQ0tFVCwgU09fRVJST1IsIChjaGFyKikgJnNfZXJyLCAmc19lcnJfc2l6 ZSkgIT0gMCkNCi0gICAgcmV0dXJuKC0xKTsNCisgICAgREJVR19SRVRVUk4oLTEp Ow0KIA0KICAgaWYgKHNfZXJyKQ0KICAgewkJCQkJCS8qIGdldHNvY2tvcHQgY291 bGQgc3VjY2VlZCAqLw0KICAgICBlcnJubyA9IHNfZXJyOw0KLSAgICByZXR1cm4o LTEpOwkJCQkJLyogYnV0IHJldHVybiBhbiBlcnJvci4uLiAqLw0KKyAgICBEQlVH X1JFVFVSTigtMSk7CQkJCQkvKiBidXQgcmV0dXJuIGFuIGVycm9yLi4uICovDQog ICB9DQotICByZXR1cm4gKDApOwkJCQkJLyogb2sgKi8NCisgIERCVUdfUkVUVVJO KDApOwkJCQkJLyogb2sgKi8NCiAjZW5kaWYgLyogSEFWRV9QT0xMICovDQogfQ0K ICNlbmRpZiAvKiBkZWZpbmVkKF9fV0lOX18pIHx8IGRlZmluZWQoX19ORVRXQVJF X18pICovDQpAQCAtMTg3Nyw3ICsxOTE0LDcgQEAgQ0xJX01ZU1FMX1JFQUxfQ09O TkVDVChNWVNRTCAqbXlzcWwsY29ucw0KICAgaW5pdF9zaWdwaXBlX3ZhcmlhYmxl cw0KICAgREJVR19FTlRFUigibXlzcWxfcmVhbF9jb25uZWN0Iik7DQogDQotICBE QlVHX1BSSU5UKCJlbnRlciIsKCJob3N0OiAlcyAgZGI6ICVzICB1c2VyOiAlcyIs DQorICBEQlVHX1BSSU5UKCJlbnRlciIsKCJob3N0OiAlcyAgZGI6ICVzICB1c2Vy OiAlcyAoY2xpZW50KSIsDQogCQkgICAgICBob3N0ID8gaG9zdCA6ICIoTnVsbCki LA0KIAkJICAgICAgZGIgPyBkYiA6ICIoTnVsbCkiLA0KIAkJICAgICAgdXNlciA/ IHVzZXIgOiAiKE51bGwpIikpOw0KQEAgLTE5MjcsNiArMTk2NCw3IEBAIENMSV9N WVNRTF9SRUFMX0NPTk5FQ1QoTVlTUUwgKm15c3FsLGNvbnMNCiAgICAgdW5peF9z b2NrZXQ9bXlzcWwtPm9wdGlvbnMudW5peF9zb2NrZXQ7DQogDQogICBteXNxbC0+ c2VydmVyX3N0YXR1cz1TRVJWRVJfU1RBVFVTX0FVVE9DT01NSVQ7DQorICBEQlVH X1BSSU5UKCJpbmZvIiwgKCJDb25uZWN0aW5nIikpOw0KIA0KICAgLyoNCiAgICAg UGFydCAwOiBHcmFiIGEgc29ja2V0IGFuZCBjb25uZWN0IGl0IHRvIHRoZSBzZXJ2 ZXINCkBAIC0xOTM2LDYgKzE5NzQsNyBAQCBDTElfTVlTUUxfUkVBTF9DT05ORUNU KE1ZU1FMICpteXNxbCxjb25zDQogICAgICAgIG15c3FsLT5vcHRpb25zLnByb3Rv Y29sID09IE1ZU1FMX1BST1RPQ09MX01FTU9SWSkgJiYNCiAgICAgICAoIWhvc3Qg fHwgIXN0cmNtcChob3N0LExPQ0FMX0hPU1QpKSkNCiAgIHsNCisgICAgREJVR19Q UklOVCgiaW5mbyIsICgiVXNpbmcgc2hhcmVkIG1lbW9yeSIpKTsNCiAgICAgaWYg KChjcmVhdGVfc2hhcmVkX21lbW9yeShteXNxbCxuZXQsIG15c3FsLT5vcHRpb25z LmNvbm5lY3RfdGltZW91dCkpID09DQogCUlOVkFMSURfSEFORExFX1ZBTFVFKQ0K ICAgICB7DQpAQCAtMjAzNCw2ICsyMDczLDggQEAgQ0xJX01ZU1FMX1JFQUxfQ09O TkVDVChNWVNRTCAqbXlzcWwsY29ucw0KICAgICB9DQogICB9DQogI2VuZGlmDQor ICBEQlVHX1BSSU5UKCJpbmZvIiwgKCJuZXQtPnZpbzogJXAgIHByb3RvY29sOiAl ZCIsDQorICAgICAgICAgICAgICAgICAgICAgIG5ldC0+dmlvLCBteXNxbC0+b3B0 aW9ucy5wcm90b2NvbCkpOw0KICAgaWYgKCFuZXQtPnZpbyAmJg0KICAgICAgICgh bXlzcWwtPm9wdGlvbnMucHJvdG9jb2wgfHwNCiAgICAgICAgbXlzcWwtPm9wdGlv bnMucHJvdG9jb2wgPT0gTVlTUUxfUFJPVE9DT0xfVENQKSkNCkBAIC0yMjY3LDYg KzIzMDgsNyBAQCBDTElfTVlTUUxfUkVBTF9DT05ORUNUKE1ZU1FMICpteXNxbCxj b25zDQogICAvKg0KICAgICBQYXJ0IDE6IENvbm5lY3Rpb24gZXN0YWJsaXNoZWQs IHJlYWQgYW5kIHBhcnNlIGZpcnN0IHBhY2tldA0KICAgKi8NCisgIERCVUdfUFJJ TlQoImluZm8iLCAoIlJlYWQgZmlyc3QgcGFja2V0LiIpKTsNCiANCiAgIGlmICgo cGt0X2xlbmd0aD1jbGlfc2FmZV9yZWFkKG15c3FsKSkgPT0gcGFja2V0X2Vycm9y KQ0KICAgew0KDQo= --Boundary_(ID_xy47bhhcC/pgpxBM5BruzA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/magnus.blaudd@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/magnus.blaudd@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: magnus.blaudd@stripped # target_branch: file:///home/msvensson/mysql/7.0-stb-bug44344/ # testament_sha1: 6655e522a11a77ea113c4a99f20613d848bfa04d # timestamp: 2010-04-15 13:38:15 +0200 # source_branch: file:///home/msvensson/mysql/next-mr/ # base_revision_id: magnus.blaudd@stripped\ # 31h4cmkycgqz8li9 # # Begin bundle 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 Mstkc2cJLtCf8XckU4UJBC6NRyA= --Boundary_(ID_xy47bhhcC/pgpxBM5BruzA)--