Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xQNq9-000000002qx-1Xsp for pgsql-bugs@arkaria.postgresql.org; Mon, 09 Nov 2026 11:47:09 +0000 Received: from localhost ([127.0.0.1]:59076 helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.98.2) (envelope-from ) id 1xQNq7-00000000dVT-3c8f for pgsql-bugs@arkaria.postgresql.org; Mon, 09 Nov 2026 11:47:08 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]:42780) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xQNq7-00000000dVL-1b2G for pgsql-bugs@lists.postgresql.org; Mon, 09 Nov 2026 11:47:07 +0000 Received: from mail-wr2-x09.google.com ([2a00:1450:4864:30::9]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98.2) (envelope-from ) id 1xQNq5-000000001Ed-2ZzA for pgsql-bugs@lists.postgresql.org; Mon, 09 Nov 2026 11:47:06 +0000 Received: by mail-wr2-x09.google.com with SMTP id ffacd0b85a97d-48df4afd489so253005f8f.0 for ; Mon, 09 Nov 2026 03:47:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794224824; x=1794829624; darn=lists.postgresql.org; h=in-reply-to:from:references:cc:to:subject:user-agent:mime-version :date:message-id:content-type:from:to:cc:subject:date:message-id :reply-to:content-type; bh=n8Cgozcrjkz0Gw383710VjqGsxYdqV9zc2ARi0RpW+E=; b=FNTVdwsaCwE3UJ6eIYbacSiyczyUbtINJBLfwV90GnGe6QbAZijkzD2BZ2WYUjpNDp cpEhR7aztPwbMLamw5hjg+lYZyOhlRGY20itVSMsMjQyio2oRAiOu1PFzcHNirgdErNv 4L1YiZcJOkET7dvADqviJ6U6tYczGhBzN68g33b3waiDasYjyW5irT8gRp6Kfwd17QdO yrwhv8WayFdSXk9K7jQ2dif1q8zr6Rd+7zzp+sCmN/dUCQbw/bgj6paOh74UQr8LSyUC TV4tiSVbXze/U00I+QNHugzXlOfS9Cn7oiua/vCgsBcxRxLT4UMDI0G+2LiT363uBDmX l4IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794224824; x=1794829624; h=in-reply-to:from:references:cc:to:subject:user-agent:mime-version :date:message-id:content-type:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to:content-type; bh=n8Cgozcrjkz0Gw383710VjqGsxYdqV9zc2ARi0RpW+E=; b=yO1d3ZQnfF8XurArXOZua+2+D3UQxna7qsXXQpx2crWqrUo1NPqytm9Myas1F7sR39 V1kkguUtztnpRweJF/pOuUKoe+gMejnpQjfouTdmXOIGB06Yeohx5r0Br+YEOyjb6aUw CtmmVyfWfot9jHAI7KDaX2mKVdtvl9XJ2CVwNDsK5CAOR5Bp1GakO+WOcuKbfKH1JCVT kJgBktHXWDW4mrVRmFAGGphVqF8htk2ztWyIL1PntGk8cLMiYjunRVUdr2+ozmsOtTgK XP6bM97dOXzpKxSAGCd1kC4ekL3h1oXrjVAQtKM63ArxP1Kb8nsTGCUTiMMrhVesnfXU nJ8Q== X-Forwarded-Encrypted: i=1; AL+hErHZuEFj/7ZjXyY7LVwpBhrx5cFIkXArVmV02nfAVJRzDHv14HWa83MYxQIBghEIgOLVgceh+NZzMCsS@lists.postgresql.org X-Gm-Message-State: APuU4Z/KcuNqhMCq2q9EfBMABtULMQn14feUhSrskdMwVUAifofQnbH5 ULdXHCnwAgAc4Uff1mFFdmP5AWfNioAyfpdPX/ZLZDYnM9kI390O7F60E0RKgKrLDszOaf97e0k = X-Gm-Gg: AYBFou2y2pTEYs0eaOeUAK8G2nsKQNQBv7GL1vczo7dWHsCiDKVkKgCqLMTGp3BLXe9 4fVKDc31KXNVx/hcX52Vjj4PGHdWxN0Hslxpa0ARAl1ojxHmxQxF2xRwxb0Saz2PQafjVAP4VZb p351HxoJ3n6SfYUuCP9FORGs5psKmAo3H0AfBMv5QpYsKakyJickK7VLeqSGfq3lnLf4yGffK1u BY0Szy89vqLEses0plPUiKb8fRXcbOYxZ9F8oVl50SosLkWBewTuVyY1uea/4zluukW33s+QNKk zQmCMRo4QqeztzhZSUpGbCr9szWAXxfF9j0X/nixPJu/ut0nz6Bn0VzAVExXo0k9/pD78KCfipr +rjPKarbr6ZTMkL6NW7yc7A2DeQD8X3nCvtWknHVUyhulogVfOMjdH50O9c1AnZYr1gKsNyehwD 9eDwaAqwUkOJGcLsiMjVXM5wGN67y3QQL4T8Tq5x587iVuSGvIt9ixmTa7vee7u0oqMsOC4tAFa Ln3JpAg6pJoYi4v7prQSPIFh6JZU+k3tlpjcEzFMpYK8FiTAV1c42FXHf2qQpw1PMTcEav0Hv9O n2ztZU78Zw44UShtldeT4S2U9Ky5PHppi5wzQAaXSxA9uh1XpTHlfeitnaCe5blrmALrskyLVz/ 10fcINm7Ub+fj/6+UoP2BEc20G7gyLcIXxDnd4DldQw9/KzURxB0MhgGAdpY8GQ== X-Received: by 2002:a05:6000:1849:b0:48b:a21:87f7 with SMTP id ffacd0b85a97d-495841c30a0mr7481420f8f.44.1794224823791; Mon, 09 Nov 2026 03:47:03 -0800 (PST) Received: from [17.235.204.81] ([17.235.204.81]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-495974660bdsm9046998f8f.37.2026.11.09.03.47.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Nov 2026 03:47:03 -0800 (PST) Content-Type: multipart/mixed; boundary="------------IHmUbiJll05Kc5xFXjt888QC" Message-ID: Date: Mon, 9 Nov 2026 19:46:59 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: BUG #19839: Assert in ReorderBufferRestoreCleanup for aborted, spilled transaction To: Bertrand Drouvot Cc: Atisss hh <125atishprak@gmail.com>, pgsql-bugs@lists.postgresql.org References: <19839-ead02c2208a3f8bd@postgresql.org> <1da45744-968f-4f40-addf-dc085e928ec5@gmail.com> From: Zhijie Hou In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------IHmUbiJll05Kc5xFXjt888QC Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, On Mon, Nov 9, 2026 at 06:53 PM Bertrand Drouvot wrote: > > On Sun, Nov 08, 2026 at 11:11:09PM +0800, Zhijie Hou wrote: > > Thanks for the report and patch. > > +1. > > > See the attachment for a test to reproduce this issue. (Feel free to merge > > if it's worth adding a test to cover this path) > > > I think in a rare case, this can also affect the stats collection > > for spilled txns. For example, if an empty subtransaction is marked > > as > > serialized, we skip incrementing spillTxns because no changes were written; > > if real changes are later serialized in this subtransaction, we still do not > > increment spillTxns because the subtransaction is already marked as > > serialized and we avoid counting it "twice". > > Agreed. > > That's why I think the test is worth adding (as the bug could also > produce real user visible impact as it can cause spill_txns to be > undercounted on non assert enabled builds). The test only detects the > regression on assert enabled builds, but I think that is enough. A > test for the spill_txns case would be more complicated and is probably > not worth it. > > > > > + if (spilled) > > + txn->txn_flags |= RBTXN_IS_SERIALIZED; > > > > ReorderBufferSerializeTXN() already has an "if (spilled)" block > > right above this, so we shall directly move the assignment into that > > block. > > +1. Thanks for the review. It looks like Atisss's update patches didn't reach the list, probably a missing Reply-All, so I'm helping to attach the same patches (provided by Atisss) here. -- Best Regards, Zhijie Hou --------------IHmUbiJll05Kc5xFXjt888QC Content-Type: text/x-patch; charset=UTF-8; name="v2-0001-fix-empty-subxact-serialized-flag.patch" Content-Disposition: attachment; filename="v2-0001-fix-empty-subxact-serialized-flag.patch" Content-Transfer-Encoding: base64 RnJvbSAwOTJkYzM0Njc4Y2QxNTFkZTQyNjIzMjJiZGExYjJkMzFiMWNlYzExIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBBdGlzaCBQcmFrYXNoIDwxMjVhdGlzaHByYWtAZ21h aWwuY29tPgpEYXRlOiBTdW4sIDggTm92IDIwMjYgMjE6MDY6MTEgKzA1MzAKU3ViamVjdDog W1BBVENIIHYyXSBEb24ndCBtYXJrIGEgdHJhbnNhY3Rpb24gc2VyaWFsaXplZCB3aGVuIG5v dGhpbmcgd2FzCiBzcGlsbGVkCgpSZW9yZGVyQnVmZmVyU2VyaWFsaXplVFhOKCkgc2V0IFJC VFhOX0lTX1NFUklBTElaRUQgb24gZXZlcnkgdHJhbnNhY3Rpb24KaXQgdmlzaXRlZCwgaW5j bHVkaW5nIHN1YnRyYW5zYWN0aW9ucyB3aXRoIG5vIGNoYW5nZXMgdG8gd3JpdGUuICBTdWNo IGEKdHJhbnNhY3Rpb24ga2VlcHMgYW4gaW52YWxpZCBmaW5hbF9sc24sIGJlY2F1c2UgZmlu YWxfbHNuIGlzIG9ubHkgYWR2YW5jZWQKYXMgY2hhbmdlcyBhcmUgd3JpdHRlbiwgc28gUmVv cmRlckJ1ZmZlclJlc3RvcmVDbGVhbnVwKCkgY2FuIGxhdGVyIGZhaWwgaXRzCmFzc2VydGlv biBvbiBpdC4gIFRoaXMgaGFwcGVucyB3aGVuIFJlb3JkZXJCdWZmZXJDaGVja0FuZFRydW5j YXRlQWJvcnRlZFRYTigpCnRydW5jYXRlcyBhbiBhYm9ydGVkIHRyYW5zYWN0aW9uLCBhbmQg d2hlbiBhIHRyYW5zYWN0aW9uIGlzIHRydW5jYXRlZCBhZnRlcgpiZWluZyBzdHJlYW1lZCBv bmNlIGEgcGFydGlhbCBjaGFuZ2UgY29tcGxldGVzLgoKSXQgYWxzbyBtYWRlIHNwaWxsX3R4 bnMgdW5kZXJjb3VudDogd2hlbiBzdWNoIGEgc3VidHJhbnNhY3Rpb24gbGF0ZXIgc3BpbGxl ZApyZWFsIGNoYW5nZXMsIGl0IHdhcyBub3QgY291bnRlZCwgYXMgaXQgd2FzIGFscmVhZHkg bWFya2VkIHNlcmlhbGl6ZWQuCgpTZXQgdGhlIGZsYWcgb25seSB3aGVuIGNoYW5nZXMgd2Vy ZSB3cml0dGVuLCBhZnRlciB0aGUgc3RhdGlzdGljcyB1cGRhdGUKdGhhdCBjaGVja3MgaXQu CgpUZXN0IGNhc2UgYnkgWmhpamllIEhvdS4KCkJ1ZzogIzE5ODM5ClJlcG9ydGVkLWJ5OiBB dGlzaCBQcmFrYXNoIDwxMjVhdGlzaHByYWtAZ21haWwuY29tPgpBdXRob3I6IEF0aXNoIFBy YWthc2ggPDEyNWF0aXNocHJha0BnbWFpbC5jb20+ClJldmlld2VkLWJ5OiBaaGlqaWUgSG91 IDxob3V6aGlqaWUyMkBnbWFpbC5jb20+CkJhY2twYXRjaC10aHJvdWdoOiAxNAoKLS0tCiBj b250cmliL3Rlc3RfZGVjb2RpbmcvZXhwZWN0ZWQvc3RyZWFtLm91dCAgICAgfCAyNCArKysr KysrKysrKysrKysrKysrCiBjb250cmliL3Rlc3RfZGVjb2Rpbmcvc3FsL3N0cmVhbS5zcWwg ICAgICAgICAgfCAxNSArKysrKysrKysrKysKIC4uLi9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jl b3JkZXJidWZmZXIuYyAgICAgICB8IDExICsrKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCA0 OSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvY29udHJpYi90 ZXN0X2RlY29kaW5nL2V4cGVjdGVkL3N0cmVhbS5vdXQgYi9jb250cmliL3Rlc3RfZGVjb2Rp bmcvZXhwZWN0ZWQvc3RyZWFtLm91dAppbmRleCAwZWM1YzkzMzYxLi45YzE2NDg0N2IwIDEw MDY0NAotLS0gYS9jb250cmliL3Rlc3RfZGVjb2RpbmcvZXhwZWN0ZWQvc3RyZWFtLm91dAor KysgYi9jb250cmliL3Rlc3RfZGVjb2RpbmcvZXhwZWN0ZWQvc3RyZWFtLm91dApAQCAtMTU3 LDYgKzE1NywzMCBAQCBTRUxFQ1QgZGF0YSBGUk9NIHBnX2xvZ2ljYWxfc2xvdF9nZXRfY2hh bmdlcygncmVncmVzc2lvbl9zbG90JywgTlVMTCwgTlVMTCwgJ2luYwogIENPTU1JVAogKDMg cm93cykKIAorLS0gYnVnICMxOTgzOQorLS0KKy0tIEEgc3VidHJhbnNhY3Rpb24gd2l0aG91 dCBkZWNvZGVkIGNoYW5nZXMgbXVzdCBub3QgYmUgbWFya2VkIGFzIHNlcmlhbGl6ZWQKKy0t IHdoZW4gaXRzIHBhcmVudCB0cmFuc2FjdGlvbiBzcGlsbHMgdG8gZGlzayBkdXJpbmcgYSBw YXJ0aWFsIFRPQVNUIGNoYW5nZQorLS0gKHN0cmVhbV90ZXN0LmRhdGEgaGFzIEVYVEVSTkFM IHN0b3JhZ2Ugc2V0IGFib3ZlKS4gIE90aGVyd2lzZSwgdHJ1bmNhdGluZworLS0gdGhlIHRy YW5zYWN0aW9uIGFmdGVyIHN0cmVhbWluZyBmYWlscyBvbiB0aGUgc3VidHJhbnNhY3Rpb24n cyBpbnZhbGlkCistLSBmaW5hbF9sc24uCitCRUdJTjsKK1NBVkVQT0lOVCBzOworU0VMRUNU IDEgRlJPTSBzdHJlYW1fdGVzdCBMSU1JVCAxIEZPUiBVUERBVEU7CisgP2NvbHVtbj8gCist LS0tLS0tLS0tCisgICAgICAgIDEKKygxIHJvdykKKworUkVMRUFTRSBTQVZFUE9JTlQgczsK K0lOU0VSVCBJTlRPIHN0cmVhbV90ZXN0IFZBTFVFUyAocmVwZWF0KCdhJywgMTAwMDAwKSk7 CitDT01NSVQ7CitTRUxFQ1QgY291bnQoKikgRlJPTSBwZ19sb2dpY2FsX3Nsb3RfZ2V0X2No YW5nZXMoJ3JlZ3Jlc3Npb25fc2xvdCcsIE5VTEwsIE5VTEwsICdpbmNsdWRlLXhpZHMnLCAn MCcsICdza2lwLWVtcHR5LXhhY3RzJywgJzEnLCAnc3RyZWFtLWNoYW5nZXMnLCAnMScpOwor IGNvdW50IAorLS0tLS0tLQorICAgICA0CisoMSByb3cpCisKIERST1AgVEFCTEUgc3RyZWFt X3Rlc3Q7CiBTRUxFQ1QgcGdfZHJvcF9yZXBsaWNhdGlvbl9zbG90KCdyZWdyZXNzaW9uX3Ns b3QnKTsKICBwZ19kcm9wX3JlcGxpY2F0aW9uX3Nsb3QgCmRpZmYgLS1naXQgYS9jb250cmli L3Rlc3RfZGVjb2Rpbmcvc3FsL3N0cmVhbS5zcWwgYi9jb250cmliL3Rlc3RfZGVjb2Rpbmcv c3FsL3N0cmVhbS5zcWwKaW5kZXggNWU0NWE4ZTliNi4uZjMxNTkzMzU1NiAxMDA2NDQKLS0t IGEvY29udHJpYi90ZXN0X2RlY29kaW5nL3NxbC9zdHJlYW0uc3FsCisrKyBiL2NvbnRyaWIv dGVzdF9kZWNvZGluZy9zcWwvc3RyZWFtLnNxbApAQCAtODIsNSArODIsMjAgQEAgUk9MTEJB Q0s7CiBJTlNFUlQgSU5UTyBzdHJlYW1fdGVzdCBWQUxVRVMgKCdhZnRlci1hYm9ydCcpOwog U0VMRUNUIGRhdGEgRlJPTSBwZ19sb2dpY2FsX3Nsb3RfZ2V0X2NoYW5nZXMoJ3JlZ3Jlc3Np b25fc2xvdCcsIE5VTEwsIE5VTEwsICdpbmNsdWRlLXhpZHMnLCAnMCcsICdza2lwLWVtcHR5 LXhhY3RzJywgJzEnKTsKIAorLS0gYnVnICMxOTgzOQorLS0KKy0tIEEgc3VidHJhbnNhY3Rp b24gd2l0aG91dCBkZWNvZGVkIGNoYW5nZXMgbXVzdCBub3QgYmUgbWFya2VkIGFzIHNlcmlh bGl6ZWQKKy0tIHdoZW4gaXRzIHBhcmVudCB0cmFuc2FjdGlvbiBzcGlsbHMgdG8gZGlzayBk dXJpbmcgYSBwYXJ0aWFsIFRPQVNUIGNoYW5nZQorLS0gKHN0cmVhbV90ZXN0LmRhdGEgaGFz IEVYVEVSTkFMIHN0b3JhZ2Ugc2V0IGFib3ZlKS4gIE90aGVyd2lzZSwgdHJ1bmNhdGluZwor LS0gdGhlIHRyYW5zYWN0aW9uIGFmdGVyIHN0cmVhbWluZyBmYWlscyBvbiB0aGUgc3VidHJh bnNhY3Rpb24ncyBpbnZhbGlkCistLSBmaW5hbF9sc24uCitCRUdJTjsKK1NBVkVQT0lOVCBz OworU0VMRUNUIDEgRlJPTSBzdHJlYW1fdGVzdCBMSU1JVCAxIEZPUiBVUERBVEU7CitSRUxF QVNFIFNBVkVQT0lOVCBzOworSU5TRVJUIElOVE8gc3RyZWFtX3Rlc3QgVkFMVUVTIChyZXBl YXQoJ2EnLCAxMDAwMDApKTsKK0NPTU1JVDsKK1NFTEVDVCBjb3VudCgqKSBGUk9NIHBnX2xv Z2ljYWxfc2xvdF9nZXRfY2hhbmdlcygncmVncmVzc2lvbl9zbG90JywgTlVMTCwgTlVMTCwg J2luY2x1ZGUteGlkcycsICcwJywgJ3NraXAtZW1wdHkteGFjdHMnLCAnMScsICdzdHJlYW0t Y2hhbmdlcycsICcxJyk7CisKIERST1AgVEFCTEUgc3RyZWFtX3Rlc3Q7CiBTRUxFQ1QgcGdf ZHJvcF9yZXBsaWNhdGlvbl9zbG90KCdyZWdyZXNzaW9uX3Nsb3QnKTsKZGlmZiAtLWdpdCBh L3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5jIGIvc3Jj L2JhY2tlbmQvcmVwbGljYXRpb24vbG9naWNhbC9yZW9yZGVyYnVmZmVyLmMKaW5kZXggNDY4 NDM5ODUzMS4uYWNiZDJjMTM0NCAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvcmVwbGljYXRp b24vbG9naWNhbC9yZW9yZGVyYnVmZmVyLmMKKysrIGIvc3JjL2JhY2tlbmQvcmVwbGljYXRp b24vbG9naWNhbC9yZW9yZGVyYnVmZmVyLmMKQEAgLTQyMTEsMTIgKzQyMTEsMjEgQEAgUmVv cmRlckJ1ZmZlclNlcmlhbGl6ZVRYTihSZW9yZGVyQnVmZmVyICpyYiwgUmVvcmRlckJ1ZmZl clRYTiAqdHhuKQogCiAJCS8qIHVwZGF0ZSB0aGUgZGVjb2Rpbmcgc3RhdHMgKi8KIAkJVXBk YXRlRGVjb2RpbmdTdGF0cygoTG9naWNhbERlY29kaW5nQ29udGV4dCAqKSByYi0+cHJpdmF0 ZV9kYXRhKTsKKworCQkvKgorCQkgKiBNYXJrIHRoZSB0cmFuc2FjdGlvbiBhcyBzZXJpYWxp emVkIG9ubHkgaWYgc29tZXRoaW5nIHdhcyB3cml0dGVuLAorCQkgKiBhbmQgb25seSBhZnRl ciB0aGUgY2hlY2sgYWJvdmUuICBmaW5hbF9sc24gaXMgYWR2YW5jZWQgZm9yIGVhY2gKKwkJ ICogY2hhbmdlIHdyaXR0ZW4sIHNvIGEgdHJhbnNhY3Rpb24gdGhhdCB3cm90ZSBub3RoaW5n LCBzdWNoIGFzIGEKKwkJICogc3VidHJhbnNhY3Rpb24gd2l0aG91dCBkZWNvZGVkIGNoYW5n ZXMsIHdvdWxkIGJlIG1hcmtlZCB3aXRoIGFuCisJCSAqIGludmFsaWQgZmluYWxfbHNuLCBh bmQgUmVvcmRlckJ1ZmZlclJlc3RvcmVDbGVhbnVwKCkgd291bGQgbGF0ZXIKKwkJICogZmFp bCBvbiBpdC4KKwkJICovCisJCXR4bi0+dHhuX2ZsYWdzIHw9IFJCVFhOX0lTX1NFUklBTEla RUQ7CiAJfQogCiAJQXNzZXJ0KHNwaWxsZWQgPT0gdHhuLT5uZW50cmllc19tZW0pOwogCUFz c2VydChkbGlzdF9pc19lbXB0eSgmdHhuLT5jaGFuZ2VzKSk7CiAJdHhuLT5uZW50cmllc19t ZW0gPSAwOwotCXR4bi0+dHhuX2ZsYWdzIHw9IFJCVFhOX0lTX1NFUklBTElaRUQ7CiAKIAlp ZiAoZmQgIT0gLTEpCiAJCUNsb3NlVHJhbnNpZW50RmlsZShmZCk7Ci0tIAoyLjUzLjAKCg== --------------IHmUbiJll05Kc5xFXjt888QC Content-Type: text/x-patch; charset=UTF-8; name="v2-REL_14_STABLE.patch" Content-Disposition: attachment; filename="v2-REL_14_STABLE.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2NvbnRyaWIvdGVzdF9kZWNvZGluZy9leHBlY3RlZC9zdHJlYW0ub3V0 IGIvY29udHJpYi90ZXN0X2RlY29kaW5nL2V4cGVjdGVkL3N0cmVhbS5vdXQKaW5kZXggMGYy MWRjYjhlMC4uMGI2Mjg4ZmIxNCAxMDA2NDQKLS0tIGEvY29udHJpYi90ZXN0X2RlY29kaW5n L2V4cGVjdGVkL3N0cmVhbS5vdXQKKysrIGIvY29udHJpYi90ZXN0X2RlY29kaW5nL2V4cGVj dGVkL3N0cmVhbS5vdXQKQEAgLTEwNiw2ICsxMDYsMjkgQEAgU0VMRUNUIGRhdGEgRlJPTSBw Z19sb2dpY2FsX3Nsb3RfZ2V0X2NoYW5nZXMoJ3JlZ3Jlc3Npb25fc2xvdCcsIE5VTEwsTlVM TCwgJ2luY2wKICBjb21taXR0aW5nIHN0cmVhbWVkIHRyYW5zYWN0aW9uCiAoMTcgcm93cykK IAorLS0gYnVnICMxOTgzOQorLS0KKy0tIEEgc3VidHJhbnNhY3Rpb24gd2l0aG91dCBkZWNv ZGVkIGNoYW5nZXMgbXVzdCBub3QgYmUgbWFya2VkIGFzIHNlcmlhbGl6ZWQKKy0tIHdoZW4g aXRzIHBhcmVudCB0cmFuc2FjdGlvbiBzcGlsbHMgdG8gZGlzayBkdXJpbmcgYSBwYXJ0aWFs IFRPQVNUIGNoYW5nZS4KKy0tIE90aGVyd2lzZSwgdHJ1bmNhdGluZyB0aGUgdHJhbnNhY3Rp b24gYWZ0ZXIgc3RyZWFtaW5nIGZhaWxzIG9uIHRoZQorLS0gc3VidHJhbnNhY3Rpb24ncyBp bnZhbGlkIGZpbmFsX2xzbi4KK0JFR0lOOworU0FWRVBPSU5UIHM7CitTRUxFQ1QgMSBGUk9N IHN0cmVhbV90ZXN0IExJTUlUIDEgRk9SIFVQREFURTsKKyA/Y29sdW1uPyAKKy0tLS0tLS0t LS0KKyAgICAgICAgMQorKDEgcm93KQorCitSRUxFQVNFIFNBVkVQT0lOVCBzOworSU5TRVJU IElOVE8gc3RyZWFtX3Rlc3QgVkFMVUVTIChyZXBlYXQoJ2EnLCAxMDAwMDApKTsKK0NPTU1J VDsKK1NFTEVDVCBjb3VudCgqKSBGUk9NIHBnX2xvZ2ljYWxfc2xvdF9nZXRfY2hhbmdlcygn cmVncmVzc2lvbl9zbG90JywgTlVMTCwgTlVMTCwgJ2luY2x1ZGUteGlkcycsICcwJywgJ3Nr aXAtZW1wdHkteGFjdHMnLCAnMScsICdzdHJlYW0tY2hhbmdlcycsICcxJyk7CisgY291bnQg CistLS0tLS0tCisgICAgIDQKKygxIHJvdykKKwogRFJPUCBUQUJMRSBzdHJlYW1fdGVzdDsK IFNFTEVDVCBwZ19kcm9wX3JlcGxpY2F0aW9uX3Nsb3QoJ3JlZ3Jlc3Npb25fc2xvdCcpOwog IHBnX2Ryb3BfcmVwbGljYXRpb25fc2xvdCAKZGlmZiAtLWdpdCBhL2NvbnRyaWIvdGVzdF9k ZWNvZGluZy9zcWwvc3RyZWFtLnNxbCBiL2NvbnRyaWIvdGVzdF9kZWNvZGluZy9zcWwvc3Ry ZWFtLnNxbAppbmRleCA0ZmVlYzYyOTcyLi4xNTQxZTVkY2EzIDEwMDY0NAotLS0gYS9jb250 cmliL3Rlc3RfZGVjb2Rpbmcvc3FsL3N0cmVhbS5zcWwKKysrIGIvY29udHJpYi90ZXN0X2Rl Y29kaW5nL3NxbC9zdHJlYW0uc3FsCkBAIC00NCw1ICs0NCwxOSBAQCB0b2FzdGVkLTEyMzQ1 Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5 MDEyMzQ1Njc4OTAxMgogCiBTRUxFQ1QgZGF0YSBGUk9NIHBnX2xvZ2ljYWxfc2xvdF9nZXRf Y2hhbmdlcygncmVncmVzc2lvbl9zbG90JywgTlVMTCxOVUxMLCAnaW5jbHVkZS14aWRzJywg JzAnLCAnc2tpcC1lbXB0eS14YWN0cycsICcxJywgJ3N0cmVhbS1jaGFuZ2VzJywgJzEnKTsK IAorLS0gYnVnICMxOTgzOQorLS0KKy0tIEEgc3VidHJhbnNhY3Rpb24gd2l0aG91dCBkZWNv ZGVkIGNoYW5nZXMgbXVzdCBub3QgYmUgbWFya2VkIGFzIHNlcmlhbGl6ZWQKKy0tIHdoZW4g aXRzIHBhcmVudCB0cmFuc2FjdGlvbiBzcGlsbHMgdG8gZGlzayBkdXJpbmcgYSBwYXJ0aWFs IFRPQVNUIGNoYW5nZS4KKy0tIE90aGVyd2lzZSwgdHJ1bmNhdGluZyB0aGUgdHJhbnNhY3Rp b24gYWZ0ZXIgc3RyZWFtaW5nIGZhaWxzIG9uIHRoZQorLS0gc3VidHJhbnNhY3Rpb24ncyBp bnZhbGlkIGZpbmFsX2xzbi4KK0JFR0lOOworU0FWRVBPSU5UIHM7CitTRUxFQ1QgMSBGUk9N IHN0cmVhbV90ZXN0IExJTUlUIDEgRk9SIFVQREFURTsKK1JFTEVBU0UgU0FWRVBPSU5UIHM7 CitJTlNFUlQgSU5UTyBzdHJlYW1fdGVzdCBWQUxVRVMgKHJlcGVhdCgnYScsIDEwMDAwMCkp OworQ09NTUlUOworU0VMRUNUIGNvdW50KCopIEZST00gcGdfbG9naWNhbF9zbG90X2dldF9j aGFuZ2VzKCdyZWdyZXNzaW9uX3Nsb3QnLCBOVUxMLCBOVUxMLCAnaW5jbHVkZS14aWRzJywg JzAnLCAnc2tpcC1lbXB0eS14YWN0cycsICcxJywgJ3N0cmVhbS1jaGFuZ2VzJywgJzEnKTsK KwogRFJPUCBUQUJMRSBzdHJlYW1fdGVzdDsKIFNFTEVDVCBwZ19kcm9wX3JlcGxpY2F0aW9u X3Nsb3QoJ3JlZ3Jlc3Npb25fc2xvdCcpOwpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvcmVw bGljYXRpb24vbG9naWNhbC9yZW9yZGVyYnVmZmVyLmMgYi9zcmMvYmFja2VuZC9yZXBsaWNh dGlvbi9sb2dpY2FsL3Jlb3JkZXJidWZmZXIuYwppbmRleCA0OGExOWVkNGY2Li43MWJmMWU4 ZTNkIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3Jk ZXJidWZmZXIuYworKysgYi9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3Jk ZXJidWZmZXIuYwpAQCAtMzg5NiwxMiArMzg5NiwyMSBAQCBSZW9yZGVyQnVmZmVyU2VyaWFs aXplVFhOKFJlb3JkZXJCdWZmZXIgKnJiLCBSZW9yZGVyQnVmZmVyVFhOICp0eG4pCiAKIAkJ LyogdXBkYXRlIHRoZSBkZWNvZGluZyBzdGF0cyAqLwogCQlVcGRhdGVEZWNvZGluZ1N0YXRz KChMb2dpY2FsRGVjb2RpbmdDb250ZXh0ICopIHJiLT5wcml2YXRlX2RhdGEpOworCisJCS8q CisJCSAqIE1hcmsgdGhlIHRyYW5zYWN0aW9uIGFzIHNlcmlhbGl6ZWQgb25seSBpZiBzb21l dGhpbmcgd2FzIHdyaXR0ZW4sCisJCSAqIGFuZCBvbmx5IGFmdGVyIHRoZSBjaGVjayBhYm92 ZS4gIGZpbmFsX2xzbiBpcyBhZHZhbmNlZCBmb3IgZWFjaAorCQkgKiBjaGFuZ2Ugd3JpdHRl biwgc28gYSB0cmFuc2FjdGlvbiB0aGF0IHdyb3RlIG5vdGhpbmcsIHN1Y2ggYXMgYQorCQkg KiBzdWJ0cmFuc2FjdGlvbiB3aXRob3V0IGRlY29kZWQgY2hhbmdlcywgd291bGQgYmUgbWFy a2VkIHdpdGggYW4KKwkJICogaW52YWxpZCBmaW5hbF9sc24sIGFuZCBSZW9yZGVyQnVmZmVy UmVzdG9yZUNsZWFudXAoKSB3b3VsZCBsYXRlcgorCQkgKiBmYWlsIG9uIGl0LgorCQkgKi8K KwkJdHhuLT50eG5fZmxhZ3MgfD0gUkJUWE5fSVNfU0VSSUFMSVpFRDsKIAl9CiAKIAlBc3Nl cnQoc3BpbGxlZCA9PSB0eG4tPm5lbnRyaWVzX21lbSk7CiAJQXNzZXJ0KGRsaXN0X2lzX2Vt cHR5KCZ0eG4tPmNoYW5nZXMpKTsKIAl0eG4tPm5lbnRyaWVzX21lbSA9IDA7Ci0JdHhuLT50 eG5fZmxhZ3MgfD0gUkJUWE5fSVNfU0VSSUFMSVpFRDsKIAogCWlmIChmZCAhPSAtMSkKIAkJ Q2xvc2VUcmFuc2llbnRGaWxlKGZkKTsK --------------IHmUbiJll05Kc5xFXjt888QC Content-Type: text/x-patch; charset=UTF-8; name="v2-REL_17_STABLE.patch" Content-Disposition: attachment; filename="v2-REL_17_STABLE.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2NvbnRyaWIvdGVzdF9kZWNvZGluZy9leHBlY3RlZC9zdHJlYW0ub3V0 IGIvY29udHJpYi90ZXN0X2RlY29kaW5nL2V4cGVjdGVkL3N0cmVhbS5vdXQKaW5kZXggYTc2 Zjc3NjAxZS4uYTRiNTFjMDA1MSAxMDA2NDQKLS0tIGEvY29udHJpYi90ZXN0X2RlY29kaW5n L2V4cGVjdGVkL3N0cmVhbS5vdXQKKysrIGIvY29udHJpYi90ZXN0X2RlY29kaW5nL2V4cGVj dGVkL3N0cmVhbS5vdXQKQEAgLTEyOCw2ICsxMjgsMjkgQEAgU0VMRUNUIGNvdW50KCopIEZS T00gcGdfbG9naWNhbF9zbG90X2dldF9jaGFuZ2VzKCdyZWdyZXNzaW9uX3Nsb3QnLCBOVUxM LCBOVUxMLAogICAgICA1CiAoMSByb3cpCiAKKy0tIGJ1ZyAjMTk4MzkKKy0tCistLSBBIHN1 YnRyYW5zYWN0aW9uIHdpdGhvdXQgZGVjb2RlZCBjaGFuZ2VzIG11c3Qgbm90IGJlIG1hcmtl ZCBhcyBzZXJpYWxpemVkCistLSB3aGVuIGl0cyBwYXJlbnQgdHJhbnNhY3Rpb24gc3BpbGxz IHRvIGRpc2sgZHVyaW5nIGEgcGFydGlhbCBUT0FTVCBjaGFuZ2UuCistLSBPdGhlcndpc2Us IHRydW5jYXRpbmcgdGhlIHRyYW5zYWN0aW9uIGFmdGVyIHN0cmVhbWluZyBmYWlscyBvbiB0 aGUKKy0tIHN1YnRyYW5zYWN0aW9uJ3MgaW52YWxpZCBmaW5hbF9sc24uCitCRUdJTjsKK1NB VkVQT0lOVCBzOworU0VMRUNUIDEgRlJPTSBzdHJlYW1fdGVzdCBMSU1JVCAxIEZPUiBVUERB VEU7CisgP2NvbHVtbj8gCistLS0tLS0tLS0tCisgICAgICAgIDEKKygxIHJvdykKKworUkVM RUFTRSBTQVZFUE9JTlQgczsKK0lOU0VSVCBJTlRPIHN0cmVhbV90ZXN0IFZBTFVFUyAocmVw ZWF0KCdhJywgMTAwMDAwKSk7CitDT01NSVQ7CitTRUxFQ1QgY291bnQoKikgRlJPTSBwZ19s b2dpY2FsX3Nsb3RfZ2V0X2NoYW5nZXMoJ3JlZ3Jlc3Npb25fc2xvdCcsIE5VTEwsIE5VTEws ICdpbmNsdWRlLXhpZHMnLCAnMCcsICdza2lwLWVtcHR5LXhhY3RzJywgJzEnLCAnc3RyZWFt LWNoYW5nZXMnLCAnMScpOworIGNvdW50IAorLS0tLS0tLQorICAgICA0CisoMSByb3cpCisK IERST1AgVEFCTEUgc3RyZWFtX3Rlc3Q7CiBTRUxFQ1QgcGdfZHJvcF9yZXBsaWNhdGlvbl9z bG90KCdyZWdyZXNzaW9uX3Nsb3QnKTsKICBwZ19kcm9wX3JlcGxpY2F0aW9uX3Nsb3QgCmRp ZmYgLS1naXQgYS9jb250cmliL3Rlc3RfZGVjb2Rpbmcvc3FsL3N0cmVhbS5zcWwgYi9jb250 cmliL3Rlc3RfZGVjb2Rpbmcvc3FsL3N0cmVhbS5zcWwKaW5kZXggN2Y0M2YwYzJhYi4uMjJh NGUxMjU1YiAxMDA2NDQKLS0tIGEvY29udHJpYi90ZXN0X2RlY29kaW5nL3NxbC9zdHJlYW0u c3FsCisrKyBiL2NvbnRyaWIvdGVzdF9kZWNvZGluZy9zcWwvc3RyZWFtLnNxbApAQCAtNTks NSArNTksMTkgQEAgUk9MTEJBQ0sgVE8gczE7CiBDT01NSVQ7CiBTRUxFQ1QgY291bnQoKikg RlJPTSBwZ19sb2dpY2FsX3Nsb3RfZ2V0X2NoYW5nZXMoJ3JlZ3Jlc3Npb25fc2xvdCcsIE5V TEwsIE5VTEwsICdpbmNsdWRlLXhpZHMnLCAnMCcsICdza2lwLWVtcHR5LXhhY3RzJywgJzEn LCAnc3RyZWFtLWNoYW5nZXMnLCAnMScpOwogCistLSBidWcgIzE5ODM5CistLQorLS0gQSBz dWJ0cmFuc2FjdGlvbiB3aXRob3V0IGRlY29kZWQgY2hhbmdlcyBtdXN0IG5vdCBiZSBtYXJr ZWQgYXMgc2VyaWFsaXplZAorLS0gd2hlbiBpdHMgcGFyZW50IHRyYW5zYWN0aW9uIHNwaWxs cyB0byBkaXNrIGR1cmluZyBhIHBhcnRpYWwgVE9BU1QgY2hhbmdlLgorLS0gT3RoZXJ3aXNl LCB0cnVuY2F0aW5nIHRoZSB0cmFuc2FjdGlvbiBhZnRlciBzdHJlYW1pbmcgZmFpbHMgb24g dGhlCistLSBzdWJ0cmFuc2FjdGlvbidzIGludmFsaWQgZmluYWxfbHNuLgorQkVHSU47CitT QVZFUE9JTlQgczsKK1NFTEVDVCAxIEZST00gc3RyZWFtX3Rlc3QgTElNSVQgMSBGT1IgVVBE QVRFOworUkVMRUFTRSBTQVZFUE9JTlQgczsKK0lOU0VSVCBJTlRPIHN0cmVhbV90ZXN0IFZB TFVFUyAocmVwZWF0KCdhJywgMTAwMDAwKSk7CitDT01NSVQ7CitTRUxFQ1QgY291bnQoKikg RlJPTSBwZ19sb2dpY2FsX3Nsb3RfZ2V0X2NoYW5nZXMoJ3JlZ3Jlc3Npb25fc2xvdCcsIE5V TEwsIE5VTEwsICdpbmNsdWRlLXhpZHMnLCAnMCcsICdza2lwLWVtcHR5LXhhY3RzJywgJzEn LCAnc3RyZWFtLWNoYW5nZXMnLCAnMScpOworCiBEUk9QIFRBQkxFIHN0cmVhbV90ZXN0Owog U0VMRUNUIHBnX2Ryb3BfcmVwbGljYXRpb25fc2xvdCgncmVncmVzc2lvbl9zbG90Jyk7CmRp ZmYgLS1naXQgYS9zcmMvYmFja2VuZC9yZXBsaWNhdGlvbi9sb2dpY2FsL3Jlb3JkZXJidWZm ZXIuYyBiL3NyYy9iYWNrZW5kL3JlcGxpY2F0aW9uL2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5j CmluZGV4IDUwOTg5ZGI2YzQuLjFlYjQyYjEzOTYgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5k L3JlcGxpY2F0aW9uL2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5jCisrKyBiL3NyYy9iYWNrZW5k L3JlcGxpY2F0aW9uL2xvZ2ljYWwvcmVvcmRlcmJ1ZmZlci5jCkBAIC00MDQ5LDEyICs0MDQ5 LDIxIEBAIFJlb3JkZXJCdWZmZXJTZXJpYWxpemVUWE4oUmVvcmRlckJ1ZmZlciAqcmIsIFJl b3JkZXJCdWZmZXJUWE4gKnR4bikKIAogCQkvKiB1cGRhdGUgdGhlIGRlY29kaW5nIHN0YXRz ICovCiAJCVVwZGF0ZURlY29kaW5nU3RhdHMoKExvZ2ljYWxEZWNvZGluZ0NvbnRleHQgKikg cmItPnByaXZhdGVfZGF0YSk7CisKKwkJLyoKKwkJICogTWFyayB0aGUgdHJhbnNhY3Rpb24g YXMgc2VyaWFsaXplZCBvbmx5IGlmIHNvbWV0aGluZyB3YXMgd3JpdHRlbiwKKwkJICogYW5k IG9ubHkgYWZ0ZXIgdGhlIGNoZWNrIGFib3ZlLiAgZmluYWxfbHNuIGlzIGFkdmFuY2VkIGZv ciBlYWNoCisJCSAqIGNoYW5nZSB3cml0dGVuLCBzbyBhIHRyYW5zYWN0aW9uIHRoYXQgd3Jv dGUgbm90aGluZywgc3VjaCBhcyBhCisJCSAqIHN1YnRyYW5zYWN0aW9uIHdpdGhvdXQgZGVj b2RlZCBjaGFuZ2VzLCB3b3VsZCBiZSBtYXJrZWQgd2l0aCBhbgorCQkgKiBpbnZhbGlkIGZp bmFsX2xzbiwgYW5kIFJlb3JkZXJCdWZmZXJSZXN0b3JlQ2xlYW51cCgpIHdvdWxkIGxhdGVy CisJCSAqIGZhaWwgb24gaXQuCisJCSAqLworCQl0eG4tPnR4bl9mbGFncyB8PSBSQlRYTl9J U19TRVJJQUxJWkVEOwogCX0KIAogCUFzc2VydChzcGlsbGVkID09IHR4bi0+bmVudHJpZXNf bWVtKTsKIAlBc3NlcnQoZGxpc3RfaXNfZW1wdHkoJnR4bi0+Y2hhbmdlcykpOwogCXR4bi0+ bmVudHJpZXNfbWVtID0gMDsKLQl0eG4tPnR4bl9mbGFncyB8PSBSQlRYTl9JU19TRVJJQUxJ WkVEOwogCiAJaWYgKGZkICE9IC0xKQogCQlDbG9zZVRyYW5zaWVudEZpbGUoZmQpOwo= --------------IHmUbiJll05Kc5xFXjt888QC--