From: marko.makela Date: June 8 2010 12:10pm Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3503) Bug#54009 List-Archive: http://lists.mysql.com/commits/110480 X-Bug: 54009 Message-Id: <201006081211.o58BaS8w006577@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0826124933==" --===============0826124933== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODExNDA1NS03YjA0 eXR1cXowbGRlNnYxCgogMzUwMyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTA4CiAgICAgIEJ1ZyM1 NDAwOTogU2VydmVyIGNyYXNoZXMgd2hlbiBkYXRhIGlzIHNlbGVjdGVkIGZyb20gbm9uIGJhY2tl ZCB1cCB0YWJsZQogICAgICBmb3IgSW5ub0RCIHBsdWdpbgogICAgICAKICAgICAgZGljdF9sb2Fk X3RhYmxlKCk6IFBhc3MgdGhlIGNvcnJlY3QgdGFibGVzcGFjZSBmbGFncyB0bwogICAgICBmaWxf b3Blbl9zaW5nbGVfdGFibGVfdGFibGVzcGFjZSgpLiBGb3IgUk9XX0ZPUk1BVD1DT01QQUNUIGFu ZCBSRURVTkRBTlQsCiAgICAgIHRoZSB0YWJsZXNwYWNlIGZsYWdzIGFyZSAwLiBUaGUgdGFibGUg ZmxhZ3Mgd291bGQgYmUgMCBvciBESUNUX1RGX0NPTVBBQ1QuCgogICAgbW9kaWZpZWQ6CiAgICAg IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwbG9hZC5jCj09PSBtb2RpZmllZCBmaWxl ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGxvYWQuYycKLS0tIGEvc3RvcmFnZS9p bm5vZGJfcGx1Z2luL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j b20tMjAxMDA2MDgxMTQwNTUtN2IwNHl0dXF6MGxkZTZ2MQorKysgYi9zdG9yYWdlL2lubm9kYl9w bHVnaW4vZGljdC9kaWN0MGxvYWQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEw MDYwODEyMTA0MS1sN3Q5cjZscnB4NmxoMzYxCkBAIC05NzMsNiArOTczLDcgQEAgZXJyX2V4aXQ6 CiAJCQkvKiBUcnkgdG8gb3BlbiB0aGUgdGFibGVzcGFjZSAqLwogCQkJaWYgKCFmaWxfb3Blbl9z aW5nbGVfdGFibGVfdGFibGVzcGFjZSgKIAkJCQkgICAgVFJVRSwgc3BhY2UsCisJCQkJICAgIGZs YWdzID09IERJQ1RfVEZfQ09NUEFDVCA/IDAgOgogCQkJCSAgICBmbGFncyAmIH4ofjAgPDwgRElD VF9URl9CSVRTKSwgbmFtZSkpIHsKIAkJCQkvKiBXZSBmYWlsZWQgdG8gZmluZCBhIHNlbnNpYmxl CiAJCQkJdGFibGVzcGFjZSBmaWxlICovCgo= --===============0826124933== 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: 7623364eea9586a98638973fb12e6a7570be3ebd # timestamp: 2010-06-08 15:10:55 +0300 # base_revision_id: marko.makela@stripped\ # 7b04ytuqz0lde6v1 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY2HNZIAAarflEAwWmf/9/8j 3oC/7//wBAAIAFAD54921nvXHOZ70e8MkRqeqeo8NTTCm0TJ6JoABoY1NM1NNNA0miGBNNAkyBmo eoADIAAACURoRJspo9T0RpkyAZBiBhNAAAxRNTZExTwk8gmjTE0AAAAaACSSnkI9TU8Jpk0TFPUN pPUzUeU9QMjT1APUItCuKO+KbHh52M5XhQ5cBAbVnvh6qpSqLplhvOqQImLkEug7WNuwqUsyJwt9 MttaU4NK1PMuSMdcWoDX+vjVRtk4l96EfxEuePMTGXOQxXGUGYOdSgRNPf6y3mFiDmGldgShnjQl 99D+3JhaS5VCKNYh9eHFJmeBBhkHqoNyC8K4bmE6xSqUKUEPSgc54MnDVewOiuXU8IhTLRISzclI GmkHVt6xQ2WktETyGgvzhttasYd8sRi2tukjFFseCxQueZD7FqFVtzEBOC18rb8DmvEMjgwPNtLg 0cm5IgYrJyrr6ztE42FQSkbBdUcjgpYVk1mduVNVywC0CYOeU5SHJd1XjlNmPaiAbCBCAhkdBBai ZqKp6AdfhlxhSGEvOgrRY1hulHSkWBaUq6QtIBrppJNxMFkhOCoaBCxYCCAN4Y8UJY9LYhaoPyLA YozAsEjkT1TrjAUC1x4Am8LFTBeCK0UVSeNtrKkK3kHIsywLASaZ06dpRk2ay2T43x6cHJ1NGawR sOnWkkQRAlmD8lSw/Q2Z4w2C1t4OIZEEftMS91PunxKpIkykC0sqBw2xGc+qS/avKDsWrufBcERz BzbAmEeEEsx8O4N/ERqDHuKXhEOwR8q54Gba06NUwiG1xa3DiFyZ447x2LeF7DsEhOltPf3Aw8IH DhKcDAGlaQZD+OCUJHr+0352e5kicRRSaoJIn2DKgqa8+1kkG3OJayM1Ex6xHPAagIlRcBoxIaY4 ClzK9G8m0IMGYBX7cR5nHLslUeO5fmxQcHAIEajnq8ZCTFkUl4Ylw5Uj+1CAEVpJU4aihSmeVrN7 RhnNI4wGlUAFfSHFU5DsN98UtaIRj3pm3IcC1DGidWQhH1AQzAteGXe03R8IqyQzEa0t3JNDAWg4 217AjPN+baoQDZN5w1vtsrTFwj9WBlSLQmCZ1QmWhhFoZ9a1QQmBDBc2NHKDRghA0OBmzw4SRvgj CfQcQTMmyaG1G9OzDD7C3VR2/FIAym7Unk+8SmQeqKl3DhRCNYLYGQkMjA24sKlk5NYIvgNMmJpq 0VWz5jfuSMQjDYRunBYXGy1HUC0E5hQ6NEPzSiFjiRA01RT2gujV4sYd0V1siSc1kswxqWZQATxp Ty5C8CykDEjzgtSn2CXhoQEQVM2YVIsXK2AmaA8BJKMqvkpantvWTnRHMZoSyYBlwUArLx8jwMt0 Zmfwdo/xdyRThQkI2HNZIA== --===============0826124933==--