From: marko.makela Date: June 30 2010 9:38am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3534) Bug#54358 List-Archive: http://lists.mysql.com/commits/112545 X-Bug: 54358 Message-Id: <201006300939.o5U93pp3019368@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1635798368==" --===============1635798368== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYzMDA5MzE0OS13bWMz N3QxMjhnaWM5MzN2CgogMzUzNCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTMwCiAgICAgIEJ1ZyM1 NDM1OCBmb2xsb3ctdXA6IENvcnJlY3Qgc29tZSBlcnJvciBoYW5kbGluZy4KCiAgICBtb2RpZmll ZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMKPT09IG1vZGlmaWVk IGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdl L2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv bS0yMDEwMDYzMDA5MzE0OS13bWMzN3QxMjhnaWM5MzN2CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3Bs dWdpbi9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjMw MDkzODQ3LTdna3IxbGgzYmgyeGtzeTAKQEAgLTM2MjcsMTEgKzM2MjcsOCBAQCByb3dfc2VhcmNo X2Zvcl9teXNxbCgKIAkJCQkJdXRfYSh0cngtPmlzb2xhdGlvbl9sZXZlbAogCQkJCQkgICAgID09 IFRSWF9JU09fUkVBRF9VTkNPTU1JVFRFRCk7CiAKLQkJCQkJZXJyID0gREJfVE9PX0JJR19SRUNP UkQ7Ci0KLQkJCQkJLyogV2UgbGV0IHRoZSBtYWluIGxvb3AgdG8gZG8gdGhlCi0JCQkJCWVycm9y IGhhbmRsaW5nICovCi0JCQkJCWdvdG8gc2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19yZWM7CisJCQkJ CS8qIFByb2NlZWQgYXMgaW4gY2FzZSBTRUxfUkVUUlkuICovCisJCQkJCWJyZWFrOwogCQkJCX0K IAogCQkJCW10cl9jb21taXQoJm10cik7CkBAIC0zNjcxLDcgKzM2NjgsNyBAQCByZWxlYXNlX3Nl YXJjaF9sYXRjaF9pZl9uZWVkZWQ6CiAJCQlkZWZhdWx0OgogCQkJCXV0X2FkKDApOwogCQkJfQot c2hvcnRjdXRfZmFpbHNfdG9vX2JpZ19yZWM6CisKIAkJCW10cl9jb21taXQoJm10cik7CiAJCQlt dHJfc3RhcnQoJm10cik7CiAJCX0KCg== --===============1635798368== 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.1-innodb/ # testament_sha1: 77595e8fd599bcac19a4a1be34e15bbd6fcc4e6e # timestamp: 2010-06-30 12:38:58 +0300 # base_revision_id: marko.makela@stripped\ # wmc37t128gic933v # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW6283QAAZ7flCAwWnP//1sG XCC/79/wBAAIAFADVtW0VtaebihlNRPFMnpAzUTT0m009IjQyAHqeiAEkkDE9SZMVPTyaIhoaADI 0AAEkmiaTTR6h6Snqep4pskNlNAPUyaDRp6g5gE0wCZDAAEwTAAABKSRoMmEaYg00aaAAAAyAYCB fdfhtrXDvyPXpxkaZtJBbVGiGtNELNMrYszLv7l+YzKxfazNEjDp1V3c+d8Dh9v7+rPGrstDGap5 ZzbyRBla43hDDWlp5Aj5MoOssL8eK57mAWwyy8joJE9JIp3z058trG+KWdyDQEdgjCQjYozeKpcI 0OWOIz1xKKisxpLwNBmIXMktmqQEbLKugQi8ZIo2FnUAjp35bvwnN4fl4dytrMZdB2PjXUNjBT68 4is2MtRDLg0kdsFKcQ08W+iOU+IrKlyRuB4QBnyoaq4BIT0+KhRFTmic1fmQI8h5vHToKeYpBqwx onmVX6Rb4cwt5ZMrsMUOW1b0/AaVIhqmbKBJO6mOrFrfG6kW1d+phWYMYSV1VTKk1U6bMoYRTngF aF1DK2lZC6wVk3gQa3SQrjyBaM6zBly5QiDCkrWe/C6GbvJ7i4e6w6d1kQdrIZSaqSLqCyCaxqiI WRZ1V3ijXooGCCRaKt8xzEi8JVBQ9dLo7rmkLWsc+aRruySY2DnxiMnMIMupOaTr4JHTr5JHsJ3u ENaR20pKnokI5tJFGFDuQDIIbhTuCni8IDaVx7RtB18e2whQmOAcbb1DcuIdWGfNY4r99vTLZmSN 6RnuWXVhiRknrXRFGcowB3cVxYjpDWsc+sgs/M/oggvPQqCX2AVDgIWasyNqw9SX8StL5zE2dVdq DiAXCQqOrO+XZTT0hoCyjS95GWR5IhgnkbhUkpioYUGgviRNCSCLQAwwyFx8gkBTcutFL2h9Fhkv Ay5TngcXdCMIlqjzqKhBPFgHgWYv6LglMJwSW00hjyi0fDs5yJUJHmSMw7T6jQ1aF4BO+VDVGMSI 4bYuDPA2UUNdEQZMvTuBZJM/mSNTWB2SXgkbwmvLk6pYtbLDNXBmTllsovhWomHSXqLpIs2Yye+Q K1dKRyXdEbp4hpplihpTR51uNmfUGivDhIrRkKe3LsCiHWXtbM41783IhiCCeCzU57pKtvwC1VDG lIOYnU1MWS8j/ind/xdyRThQkG6283Q= --===============1635798368==--