From: marko.makela Date: November 2 2010 7:35am Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3217) List-Archive: http://lists.mysql.com/commits/122491 Message-Id: <201011020735.oA27ZrkS012781@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1230482913==" --===============1230482913== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMTA4NDkyOC1hYmxm NnNvcWo4MXYwZXBnCgogMzIxNyBNYXJrbyBNw6RrZWzDpAkyMDEwLTExLTAyIFttZXJnZV0KICAg ICAgTWVyZ2UgbXlzcWwtNS4xLWlubm9kYiB0byBteXNxbC01LjUtaW5ub2RiLgoKICAgIG1vZGlm aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMKPT09IG1vZGlmaWVkIGZp bGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz ZS9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTAxMDg0 OTI4LWFibGY2c29xajgxdjBlcGcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5j CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTAyMDczNDA5LXZjZHhrdjI3eGt6 azRtcnYKQEAgLTEwNCw2ICsxMDQsMTggQEAgcm93X3NlbF9zZWNfcmVjX2lzX2Zvcl9ibG9iKAog CXVsaW50CWxlbjsKIAlieXRlCWJ1ZltESUNUX01BWF9JTkRFWF9DT0xfTEVOXTsKIAorCXV0X2Eo Y2x1c3RfbGVuID49IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkUpOworCisJaWYgKFVOSVZfVU5M SUtFTFkKKwkgICAgKCFtZW1jbXAoY2x1c3RfZmllbGQgKyBjbHVzdF9sZW4gLSBCVFJfRVhURVJO X0ZJRUxEX1JFRl9TSVpFLAorCQkgICAgIGZpZWxkX3JlZl96ZXJvLCBCVFJfRVhURVJOX0ZJRUxE X1JFRl9TSVpFKSkpIHsKKwkJLyogVGhlIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkIHdhcyBub3Qg d3JpdHRlbiB5ZXQuCisJCVRoaXMgcmVjb3JkIHNob3VsZCBvbmx5IGJlIHNlZW4gYnkKKwkJcmVj dl9yZWNvdmVyeV9yb2xsYmFja19hY3RpdmUoKSBvciBhbnkKKwkJVFJYX0lTT19SRUFEX1VOQ09N TUlUVEVEIHRyYW5zYWN0aW9ucy4gKi8KKwkJcmV0dXJuKEZBTFNFKTsKKwl9CisKIAlsZW4gPSBi dHJfY29weV9leHRlcm5hbGx5X3N0b3JlZF9maWVsZF9wcmVmaXgoYnVmLCBzaXplb2YgYnVmLAog CQkJCQkJICAgICAgemlwX3NpemUsCiAJCQkJCQkgICAgICBjbHVzdF9maWVsZCwgY2x1c3RfbGVu KTsKCg== --===============1230482913== 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/mysql2a/5.5-innodb/ # testament_sha1: 803b47bbf11b9ee4b6fba6c10246d60979c3bf7c # timestamp: 2010-11-02 09:35:46 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # ablf6soqj81v0epg # # Begin bundle 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 --===============1230482913==--