From: marko.makela Date: May 25 2012 8:07pm Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3865 to 3867) List-Archive: http://lists.mysql.com/commits/143962 Message-Id: <201205252007.q4PK79Kl026534@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM4NjcgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNQogICAgICBwcmVwYXJlX2lucGxhY2VfYWx0 ZXJfdGFibGVfZGljdCgpOiBEbyBub3QgYWNxdWlyZSBsb2NrIG9uIHRoZSBuZXcgdGFibGUuCiAg ICAgIFdlIHNraXAgYWxsIHJlY29yZCBsb2NraW5nIHdoZW4gcG9wdWxhdGluZyB0aGUgaW5kZXhl cy4KICAgICAgVGhlIHRhYmxlIGxvY2tpbmcgb24gdGhlIHRhcmdldCAocmVidWlsdCkgdGFibGUg aXMgdW5uZWNlc3NhcnkgdG9vLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl L2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwogMzg2NiBNYXJrbyBNw6RrZWzDpAkyMDEyLTA1LTI1 CiAgICAgIFdMIzYyNTUgcHJlcGFyYXRpb246IEFkZCBMT0NLPVNIQVJFRCB0byBtYWluLmlubm9k Yl9teXNxbF9zeW5jLnRlc3QKICAgICAgc28gdGhhdCBpdCB3aWxsIHBhc3Mgd2hlbiBBREQgUFJJ TUFSWSBLRVkgY2FuIGJlIGRvbmUgb25saW5lLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10 ZXN0L3IvaW5ub2RiX215c3FsX3N5bmMucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC9pbm5vZGJf bXlzcWxfc3luYy50ZXN0CiAzODY1IE1hcmtvIE3DpGtlbMOkCTIwMTItMDUtMjUKICAgICAgQnVn IzE0MTE3NjQxIChwb3NzaWJsZSBmaXgpIGFuZCBhIFdMIzYyNTUgb3B0aW1pemF0aW9uCiAgICAg IAogICAgICBBbGxvdyB0aGUgbm9uLW9ubGluZSBJbm5vREIgaW4tcGxhY2UgRERMIG9wZXJhdGlv bnMgd2l0aCBMT0NLPVNIQVJFRC4KICAgICAgCiAgICAgIHByZXBhcmVfaW5wbGFjZV9hbHRlcl90 YWJsZV9kaWN0KCk6IFdoZW4gY3JlYXRpbmcgaW5kZXhlcyBhbmQKICAgICAgYW4gb25saW5lIG9w ZXJhdGlvbiBoYXMgbm90IGJlZW4gcmVxdWVzdGVkLCBhY3F1aXJlIFMtbG9jayBvbiB0aGUgdGFi bGUuCiAgICAgIFByZXZpb3VzbHksIHdlIGFjcXVpcmVkIGFuIFgtbG9jaywgYW5kIG9ubHkgd2hl biB0aGUgdGFibGUgd2FzIGJlaW5nIHJlYnVpbHQuCiAgICAgIEZhaWx1cmUgdG8gbG9jayB0aGUg dGFibGUgbWlnaHQgZXhwbGFpbiBCdWcjMTQxMTc2NDEgaWYgdGhlcmUgd2FzIGEKICAgICAgZm9y ZWlnbiBrZXkgQ0FTQ0FERSBvciBTRVQgTlVMTCBjb25zdHJhaW50IHJlZmVyZW5jaW5nIHRoZSB0 YWJsZS4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL2lubm9kYl9teXNxbF9zeW5j LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1hbHRlci5yZXN1 bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItYWx0ZXIudGVzdAogICAg ICBteXNxbC10ZXN0L3QvaW5ub2RiX215c3FsX3N5bmMudGVzdAogICAgICBzdG9yYWdlL2lubm9i YXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVz dC9yL2lubm9kYl9teXNxbF9zeW5jLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9yL2lubm9kYl9t eXNxbF9zeW5jLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyNTEx MzkyNC0yM2pja295ZDRuMHdrcHU4CisrKyBiL215c3FsLXRlc3Qvci9pbm5vZGJfbXlzcWxfc3lu Yy5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjUyMDAwNDUtbXY3 dXE0aDVneXRpa3IwMgpAQCAtMTE5LDcgKzExOSw3IEBAIERST1AgREFUQUJBU0UgZGIxOwogQ1JF QVRFIFRBQkxFIHQxKGEgSU5UIE5PVCBOVUxMLCBiIElOVCBOT1QgTlVMTCkgZW5naW5lPWlubm9k YjsKIFNFVCBERUJVR19TWU5DPSAiYWx0ZXJfdGFibGVfaW5wbGFjZV9hZnRlcl9sb2NrX2Rvd25n cmFkZSBTSUdOQUwgbWFuYWdlIFdBSVRfRk9SIHF1ZXJ5IjsKICMgU2VuZGluZzoKLUFMVEVSIFRB QkxFIHQxIEFERCBVTklRVUUgSU5ERVgoYSk7CitBTFRFUiBUQUJMRSB0MSBBREQgVU5JUVVFIElO REVYKGEpLCBMT0NLPVNIQVJFRDsKICMgQ29ubmVjdGlvbiBjb24xCiBTRVQgREVCVUdfU1lOQz0g Im5vdyBXQUlUX0ZPUiBtYW5hZ2UiOwogVVNFIHRlc3Q7CkBAIC0xMzksNyArMTM5LDcgQEAgU0VU IERFQlVHX1NZTkM9ICJub3cgU0lHTkFMIHF1ZXJ5IjsKIEFMVEVSIFRBQkxFIHQxIERST1AgSU5E RVggYTsKIFNFVCBERUJVR19TWU5DPSAiYWx0ZXJfdGFibGVfaW5wbGFjZV9hZnRlcl9sb2NrX2Rv d25ncmFkZSBTSUdOQUwgbWFuYWdlIFdBSVRfRk9SIHF1ZXJ5IjsKICMgU2VuZGluZzoKLUFMVEVS IFRBQkxFIHQxIEFERCBQUklNQVJZIEtFWSAoYSk7CitBTFRFUiBUQUJMRSB0MSBBREQgUFJJTUFS WSBLRVkgKGEpLCBMT0NLPVNIQVJFRDsKICMgQ29ubmVjdGlvbiBjb24xCiBTRVQgREVCVUdfU1lO Qz0gIm5vdyBXQUlUX0ZPUiBtYW5hZ2UiOwogU0VMRUNUICogRlJPTSB0MTsKCj09PSBtb2RpZmll ZCBmaWxlICdteXNxbC10ZXN0L3QvaW5ub2RiX215c3FsX3N5bmMudGVzdCcKLS0tIGEvbXlzcWwt dGVzdC90L2lubm9kYl9teXNxbF9zeW5jLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j b20tMjAxMjA1MjUxMTM5MjQtMjNqY2tveWQ0bjB3a3B1OAorKysgYi9teXNxbC10ZXN0L3QvaW5u b2RiX215c3FsX3N5bmMudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUy NTIwMDA0NS1tdjd1cTRoNWd5dGlrcjAyCkBAIC0xOTEsNyArMTkxLDcgQEAgRFJPUCBEQVRBQkFT RSBkYjE7CiBDUkVBVEUgVEFCTEUgdDEoYSBJTlQgTk9UIE5VTEwsIGIgSU5UIE5PVCBOVUxMKSBl bmdpbmU9aW5ub2RiOwogU0VUIERFQlVHX1NZTkM9ICJhbHRlcl90YWJsZV9pbnBsYWNlX2FmdGVy X2xvY2tfZG93bmdyYWRlIFNJR05BTCBtYW5hZ2UgV0FJVF9GT1IgcXVlcnkiOwogLS1lY2hvICMg U2VuZGluZzoKLS0tc2VuZCBBTFRFUiBUQUJMRSB0MSBBREQgVU5JUVVFIElOREVYKGEpCistLXNl bmQgQUxURVIgVEFCTEUgdDEgQUREIFVOSVFVRSBJTkRFWChhKSwgTE9DSz1TSEFSRUQKIAogLS1l Y2hvICMgQ29ubmVjdGlvbiBjb24xCiBjb25uZWN0aW9uIGNvbjE7CkBAIC0yMjcsNyArMjI3LDcg QEAgY29ubmVjdGlvbiBkZWZhdWx0OwogQUxURVIgVEFCTEUgdDEgRFJPUCBJTkRFWCBhOwogU0VU IERFQlVHX1NZTkM9ICJhbHRlcl90YWJsZV9pbnBsYWNlX2FmdGVyX2xvY2tfZG93bmdyYWRlIFNJ R05BTCBtYW5hZ2UgV0FJVF9GT1IgcXVlcnkiOwogLS1lY2hvICMgU2VuZGluZzoKLS0tc2VuZCBB TFRFUiBUQUJMRSB0MSBBREQgUFJJTUFSWSBLRVkgKGEpCistLXNlbmQgQUxURVIgVEFCTEUgdDEg QUREIFBSSU1BUlkgS0VZIChhKSwgTE9DSz1TSEFSRUQKIAogLS1lY2hvICMgQ29ubmVjdGlvbiBj b24xCiBjb25uZWN0aW9uIGNvbjE7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz ZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxl ci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI1 MTEzOTI0LTIzamNrb3lkNG4wd2twdTgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hh bmRsZXIwYWx0ZXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjUyMDAw NDUtbXY3dXE0aDVneXRpa3IwMgpAQCAtMTc4NSwxNCArMTc4NSw2IEBAIG9wX29rOgogCiAJdXRf YSh0cngtPmxvY2subl9hY3RpdmVfdGhycyA9PSAwKTsKIAotCWlmIChuZXdfY2x1c3RlcmVkKSB7 Ci0JCS8qIEEgY2x1c3RlcmVkIGluZGV4IGlzIHRvIGJlIGJ1aWx0LiAgQWNxdWlyZSBhIHNoYXJl ZAotCQl0YWJsZSBsb2NrIGFsc28gb24gdGhlIHRhYmxlIHRoYXQgaXMgYmVpbmcgY3JlYXRlZC4g Ki8KLQkJREJVR19BU1NFUlQoaW5kZXhlZF90YWJsZSAhPSB1c2VyX3RhYmxlKTsKLQotCQllcnJv ciA9IHJvd19tZXJnZV9sb2NrX3RhYmxlKHVzZXJfdHJ4LCBpbmRleGVkX3RhYmxlLCBMT0NLX1Mp OwotCX0KLQogZXJyb3JfaGFuZGxpbmc6CiAJLyogQWZ0ZXIgYW4gZXJyb3IsIHJlbW92ZSBhbGwg dGhvc2UgaW5kZXggZGVmaW5pdGlvbnMgZnJvbSB0aGUKIAlkaWN0aW9uYXJ5IHdoaWNoIHdlcmUg ZGVmaW5lZC4gKi8KCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku