From: marko.makela Date: June 2 2010 10:39am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3496) Bug#53674 List-Archive: http://lists.mysql.com/commits/109931 X-Bug: 53674 Message-Id: <201006021039.o52AdYU3011890@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0706346410==" --===============0706346410== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMjEwMzcxNC0wbnd4 ZHFza2ViMWlob3pqCgogMzQ5NiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAyCiAgICAgIERvY3Vt ZW50IHRoZSBCdWcgIzUzNjc0IGZpeCBpbiB0aGUgSW5ub0RCIFBsdWdpbgoKICAgIG1vZGlmaWVk OgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCj09PSBtb2RpZmllZCBmaWxl ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9w bHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAyMTAz NzE0LTBud3hkcXNrZWIxaWhvemoKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxv ZwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMjEwMzkwMy0zM2J5aXhzM3hs cWN3c2owCkBAIC0xLDMgKzEsMTAgQEAKKzIwMTAtMDYtMDIJVGhlIElubm9EQiBUZWFtCisKKwkq IGluY2x1ZGUvZGIwZXJyLmgsIGluY2x1ZGUvbG9jazBsb2NrLmgsIGluY2x1ZGUvcm93MG15c3Fs LmgsCisJbG9jay9sb2NrMGxvY2suYywgcm93L3JvdzBpbnMuYywgcm93L3JvdzBteXNxbC5jLCBy b3cvcm93MHNlbC5jOgorCUZpeCBCdWcjNTM2NzQgSW5ub0RCOiBFcnJvcjogdW5sb2NrIHJvdyBj b3VsZCBub3QgZmluZCBhCisJNCBtb2RlIGxvY2sgb24gdGhlIHJlY29yZAorCiAyMDEwLTA2LTAx CVRoZSBJbm5vREIgVGVhbQogCiAJKiBpbmNsdWRlL3N5bmMwcncuaCwgc3luYy9zeW5jMHJ3LmM6 Cgo= --===============0706346410== 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: 9d8bf8dc61e4ab42fb62b503b9111a402efe6889 # timestamp: 2010-06-02 13:39:23 +0300 # base_revision_id: marko.makela@stripped\ # 0nwxdqskeb1ihozj # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcZpW3MAAZ9flAAwWnf/918m RAC////wBAAIAFADyu5odPdoaz3a8JJIgxNAYEPSp4KflMiepptNQaeiPUDVMRiaJ5IPU2oNABoA AANAJJBNNAJppoInlP1CDaQAGmgZAySJtRshANDQDQAAAAAJKIanqn6kejKP1T1P1NQxNA9IYjJo DQDLIxdVi6eN551+s4+l73Dp70SWnU4fA50eGf6GFuvoe0N9cMD75i/d9DiiStOJaIFn6/DqxTBK GnT6NAQGO8UKaGQyk2g/PknMiHh2Pgdst/a+SfHISrn3uEcBdi4lOVFNGVLrYmSVPQtEhLbuAkLr vOpCxUoRPQgWBC4EUpRIojEFv4EPhGCDMUyKC+BE65QEdFEZVPgDKLV76S7EYcmsvQ/4z62BddqD tq3mL+csIReUtpnt8qc6l714kFVsvUonj2PcSMNljmYvaloOelI3wIJaJvXW98pVjufSZQD5hpst ISLxNZOzULVQSirR6zJTeKvYTSg7ZV6BW2HPCKrxcuNUC4yimwdhqUaaigoHmJr8fPTabMsX/QdA 5B1ax/DFFRDEwmttjEUhxQ2+rNgxLS5lkZ9JXJTYvgrSFriN5OutWXEx75QowLXOzHUmIAiKdJoo YzBwnIpYWHrxDBTkhDWBtd4gaIwsKvxhPXdbKhlK8dbXFqNaLnlDk1LRJhKluRt557irtecNO7Ub kjvJ2MmHfi08CritKY6zrYcnqDlB+GLg7NEw5oSiW1hy2Y0hxI053JFM5VgnDEkXOrroVSySI94h LdvM8ipJ9pAQ5goFYrVEbN1mCTgRV2mEjtLSny4dDG7qSe5IeqUi7XppTbzFxnKjXt893USUFm6C rux8RplNmNp91Ff3rNW5yQ4Zvts6Oaawu+dewudgUjBi/vopiyvfq553uz4b2iHJcx7MSgpsZ0TJ qqaJJNc5qjIwwJ00Y2dse6yfkYzWSnbhcq2PA3cGGfyvpwQU8ltNQe60m9sV48Myyqq+PMl/umhe a1SoChDtwW4sOn4troiGY6QzeXB7CdnYK8pIGrGkbrAkC1WsYDgickuO6yRIYkzw6bKj18zzFLIu /lkl4pFyQ8IzoM7ltUsYZHGrKiJrKCKIxT0D2ctKfFQzCTsBMyZTXLsBQoWaXe6/DyW4FZYGkV+k j1hRcuT1XsjIA0l8QNjRCoLysqvva6QMo0GSKMvtYhJ3FIlkNwuB/ZQCcozQv3gyA/3Y8GFnWKFU +XJhGspkDNwrlvLPuKilGV945ry9p4m5lRLKZSEweywtmvAanl02Q9HQVGEHgNFMr5wrzE0TldgX MLKR44vNJSofxJ5/i7kinChIYzStuYA= --===============0706346410==--