From: marko.makela Date: June 3 2010 9:45am Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3497) List-Archive: http://lists.mysql.com/commits/110082 Message-Id: <201006031036.o53AaaoU030571@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1877260168==" --===============1877260168== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMjEwMzkwMy0zM2J5 aXhzM3hscWN3c2owCgogMzQ5NyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAzCiAgICAgIEFkZCBp bm5vZGJfcGx1Z2luIHRvIG15c3FsLXRlc3QtcnVuIGRlZmF1bHQgc3VpdGVzLgoKICAgIG1vZGlm aWVkOgogICAgICBteXNxbC10ZXN0L215c3FsLXRlc3QtcnVuLnBsCj09PSBtb2RpZmllZCBmaWxl ICdteXNxbC10ZXN0L215c3FsLXRlc3QtcnVuLnBsJwotLS0gYS9teXNxbC10ZXN0L215c3FsLXRl c3QtcnVuLnBsCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAyMTAzOTAzLTMz YnlpeHMzeGxxY3dzajAKKysrIGIvbXlzcWwtdGVzdC9teXNxbC10ZXN0LXJ1bi5wbAlyZXZpZDpt YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMzA5NDUzNC1pd280c3ZmMzZpNDByeXVhCkBA IC0xMjksNyArMTI5LDcgQEAgbXkgJHBhdGhfY29uZmlnX2ZpbGU7ICAgICAgICAgICAjIFRoZSBn ZQogIyBleGVjdXRhYmxlcyB3aWxsIGJlIHVzZWQgYnkgdGhlIHRlc3Qgc3VpdGUuCiBvdXIgJG9w dF92c19jb25maWcgPSAkRU5WeydNVFJfVlNfQ09ORklHJ307CiAKLW15ICRERUZBVUxUX1NVSVRF Uz0gIm1haW4sYmlubG9nLGZlZGVyYXRlZCxycGwscnBsX25kYixuZGIsaW5ub2RiIjsKK215ICRE RUZBVUxUX1NVSVRFUz0gIm1haW4sYmlubG9nLGZlZGVyYXRlZCxycGwscnBsX25kYixuZGIsaW5u b2RiLGlubm9kYl9wbHVnaW4iOwogbXkgJG9wdF9zdWl0ZXM7CiAKIG91ciAkb3B0X3ZlcmJvc2U9 IDA7ICAjIFZlcmJvc2Ugb3V0cHV0LCBlbmFibGUgd2l0aCAtLXZlcmJvc2UKCg== --===============1877260168== 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: 3af7127fafecea6bed4b01393e758463ac295dbc # timestamp: 2010-06-03 12:45:53 +0300 # base_revision_id: marko.makela@stripped\ # 33byixs3xlqcwsj0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaXlyhkAAXRflAAQVGf//3cm DgC////wBAAIAFADt67DHNsG2du3hJKBkJpPQ0mMmjRqn6mFA8o02obU00CUIRHimaAmmk1PKekA AGmQABJSekyKbTRHpkCaeoGjaQGQ0GgBzTEwAJgAmAAEwABMEkk9SNoyjQamCantNU9QPU8o0MQy aBTQz7rvOY3phZCIG+DLJ7nO1/brfVvUVfp8U+76hZKWEP7nq7rPCf0MT+TKbFV3nL8YW7JXEaId rCY5P4+Cx1r8iJpVTSwTTZ4H1qTfI5GWMZ6iGfAQcGSxhveJcqhcOQWXmENUQJaVBWqQUEyRcSSy RE2AHL3IOh6OlIpxQDnvg7DIOmVYcdZ20d2koeZVFy7bdNV7+UlR5zsNWfZqoOJdiHOzlbuWcpMu jMSLdTEdhPqCYKywZpUzdGDbcZQyzDCdVVRXCgVbaxYsaZ08P5gnAm6tFkqKNusTZtA5cRLocDAU tZGzhVVvsDKJ4sdKNUnNkPGTOUbTUakGM0CfPRqaQLbUvSr+7BO0kTXmZjDNGKPO1406p0K+ud2l 1kRq5WOyOll4VbBHUMeDaTmYG0dYNOhJZvVSDJhRYXhY4gyLWsB4Oe1/Iq/flTPryQsM/rx1COPb e4xsMdusPb1i7js0P89e/j3lz6KEbuZ0qjP6i0jIgvLZYyUR8uU2HDqIfRjhDgkfPNF74o/eME7c +ntWgyQIEYfq+hrTmaFp9gYuqbkn3DHDU2ulZmb6pMoh70QpP+JNtqmFNXWy3JBHtmpjUPmzKbdd wx5Z7SaWYuBdKq4JO0v1k6J10uZ18EEMobMLtsMDnsn27aMi0vrwM+mZ7R94DzSPI7JlHoyQX2+k VtkCZh4WXQqLQZqBeFzMmLPxYehdypPbhTrYkMLUczjdzGNYOz7MSq1EQsthT+vsmxOuHmhQlXIq 3h4YVyNi9q87vENoV7tsor1JeyjLjkU/PUS1CO9gWpHAN5xDIGWAOwjJYIabbpXab86hNSkS5JHX oI2ryHCt2Ypa644fgjCBHlh03cUwmqpFtyoxkKVzfUHTjzHRTNSMEwVIgZMr997CPcUgU17QTy9j jGe4iYJ1RshVOu9ZemrYzKMk2UMNpJ63T1LmQI0a61MYhLSz0T24R9MqREKmwch2EYVkSRVieaU/ hamLiXEFvStPX18q+bohJCIKMY833iZa9b0c2B2PZ9MK8RiQ1PZumU1hIGHgo5ROaayF9l8XZXww riWJxVoeKEFotLIVFymTKahRMzlseiclE2F9E5Gf+Pl/Yu5IpwoSFLy5QyA= --===============1877260168==--