From: marko.makela Date: June 8 2010 12:12pm Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3504) Bug#54009 List-Archive: http://lists.mysql.com/commits/110482 X-Bug: 54009 Message-Id: <201006081212.o58BaS92006577@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1422935242==" --===============1422935242== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODEyMTA0MS1sN3Q5 cjZscnB4NmxoMzYxCgogMzUwNCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTA4CiAgICAgIERvY3Vt ZW50IEJ1ZyM1NDAwOSBpbiB0aGUgSW5ub0RCIFBsdWdpbiBDaGFuZ2VMb2cuCgogICAgbW9kaWZp ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKPT09IG1vZGlmaWVkIGZp bGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2Ri X3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDgx MjEwNDEtbDd0OXI2bHJweDZsaDM2MQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdl TG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjA4MTIxMjE1LTRtYmlzdTNm eWszcmV1eXEKQEAgLTEsMyArMSw5IEBACisyMDEwLTA2LTA4CVRoZSBJbm5vREIgVGVhbQorCisJ KiBkaWN0L2RpY3QwbG9hZC5jOgorCUZpeCBCdWcjNTQwMDkgU2VydmVyIGNyYXNoZXMgd2hlbiBk YXRhIGlzIHNlbGVjdGVkIGZyb20gbm9uIGJhY2tlZAorCXVwIHRhYmxlIGZvciBJbm5vREIgcGx1 Z2luCisKIDIwMTAtMDYtMDIJVGhlIElubm9EQiBUZWFtCiAKIAkqIGluY2x1ZGUvZGIwZXJyLmgs IGluY2x1ZGUvbG9jazBsb2NrLmgsIGluY2x1ZGUvcm93MG15c3FsLmgsCgo= --===============1422935242== 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: 912001ca8fd7ebf03e3ee94d41426e982d1a8d2d # timestamp: 2010-06-08 15:12:28 +0300 # base_revision_id: marko.makela@stripped\ # l7t9r6lrpx6lh361 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc4MwEoAAY7flAAwWnP/918m TAC////wBAAIAFADh523HXd7dOo73vCUQk9BMp6Ke9EaYpintU/SmnpBmoxlM0QJSEaNGETJHlGT IaZNAAAAAlJojTVPak/U1NqD0IZGCB6jTJpoNDIMoTUeppoaaPU00AaPUAAAAAJJCZU2INNU80jx JNmVM1DTNRkGEbSKaFKu7x5OtP3+fIusrt1FtTpkS21g9rGPh+B60+JzdkfPE5zWfHV8fI6Q4aFi cu3IenvaR/zRdKyZT19WE7c95Bl+riDmCYyEjDfhkv8jfyrEbvMgKwnK9vwD0a2RmtvSNXSkbNVF M8t1EQqyjmSIGcxBWkLCsdpZRR9XiHuocr0CYcNpUVIxabmTzWECqSC2vR/WwE8JBRww9jW39Utd IQQJBJW11Ve6mngmJ9MswjeRVaLm1fVhOxcbNBY2ftuSM+rIkrMv4ujeRk64qgH3Cc0viSMzCEsj NaUmemCONzZ+CcInRBpLEqiXKqLJkvM04qYmI6CcUXlW7c2M4lOxwjWvqsd3isNIaskCVmCkHj2G OeMFuKVIFEkXa7LqG4FtqUDB5S7sTFFvIpbYV1sIsSse4lMkG1CrYMsGoFd0mojVchT33nDy68ZE YSlOtc4ssvMsSqsc6URmxIQoiJZIofJTXoWsKVosaxEgPjXcQnpkznc01fPjmNKIeSR5VRTznPQl ZrTbKs4sTJ4QcEH6NLgw63pg59Q116Rxj244JFVNQig8BISM70L6zCBJAR4nEhaBbQ6IqEscoUXW GAwJTDtTXMLgb5mFh3xZS+gj46bFKWKCSIhTncWXYfZqR38FFaRiToy4wakLzKS2le2NpTt0FbtJ qER+/IuFr7ob20X4bbNhgyUKFDso6u+75qdvYxbb9lHarvNhMiFS0/LE8EVFNteeO7rIl8pKIPRk hibinhrKjRFsaXk50xw1suxmpFiuA1MQYHnVuTdAegWYUcpomZdUi0y9B9PhFiaVIw4QVd4TP9tO Z1IbyPANgm7w5vsWsaItqIeusNgLnCQczq0wl8cs6Q4fvVGnp3fqZUcOXZPPiC+yRaHE/IztutfM XNVNWXUTQIJ9LnBtmTwezg2eyf1hGQnsmXywBPmWv+O0cga8E/IGMCf1SOAJNpJiawNptQgpC1TZ i3y4jlEllSNB5lRJwmqsjYDTlkQzzgkEvVu5JI+djErVMtGdvVHjRabkAW2CWwKAaIqjMXGtGMiL hFja5ixTbMaxwVAxSPYJH0Ki+HPJmEikSKVwUNmglbIkxemqcS4SFsJDvJf8Zun/F3JFOFCQzgzA Sg== --===============1422935242==--