From 4726b4ce1f17b400d88c74c037538d1dfd09c4c5 Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Fri, 2 Apr 2021 21:57:24 +0800 Subject: [PATCH 1/2] cherry pick #5196 to master Signed-off-by: ti-srebot --- TOC.md | 1 + releases/release-4.0.12.md | 7 +++++++ releases/release-notes.md | 1 + 3 files changed, 9 insertions(+) diff --git a/TOC.md b/TOC.md index 3936a4775c6ea..c52619354238c 100644 --- a/TOC.md +++ b/TOC.md @@ -529,6 +529,7 @@ + v5.0 + [5.0.0-rc](/releases/release-5.0.0-rc.md) + v4.0 + + [4.0.12](/releases/release-4.0.12.md) + [4.0.11](/releases/release-4.0.11.md) + [4.0.10](/releases/release-4.0.10.md) + [4.0.9](/releases/release-4.0.9.md) diff --git a/releases/release-4.0.12.md b/releases/release-4.0.12.md index 60d5e8344d25b..281db900671ad 100644 --- a/releases/release-4.0.12.md +++ b/releases/release-4.0.12.md @@ -119,10 +119,17 @@ TiDB version: 4.0.12 + TiCDC - Fix a disorder issue of the `resolved ts` event [#1464](https://github.com/pingcap/ticdc/pull/1464) +<<<<<<< HEAD - Fix a data loss issue caused by wrong table scheduling due to the network problem [#1508](https://github.com/pingcap/ticdc/pull/1508) - Fix a bug of untimely release of resources after a processor is stopped [#1547](https://github.com/pingcap/ticdc/pull/1547) - Fix a bug that the transaction counter is not correctly updated, which might cause database connection leak [#1524](https://github.com/pingcap/ticdc/pull/1524) - Fix the issue that multiple owners can co-exist when PD has jitter, which might lead to table missing [#1540](https://github.com/pingcap/ticdc/pull/1540) +======= + - Fix a bug of untimely release of resources after a processor is stopped [#1547](https://github.com/pingcap/ticdc/pull/1547) + - Fix a bug that the transaction counter is not correctly updated, which might cause database connection leak [#1524](https://github.com/pingcap/ticdc/pull/1524) + - Fix the issue that multiple owners can co-exist when PD has jitter, which might lead to table missing [#1540](https://github.com/pingcap/ticdc/pull/1540) + - Fix a data loss issue caused by wrong table scheduling due to the network problem [#1508](https://github.com/pingcap/ticdc/pull/1508) +>>>>>>> 97069e7a... update tidb v4.0.12 release notes (#5090) (#5196) + Backup & Restore (BR) diff --git a/releases/release-notes.md b/releases/release-notes.md index 903f159c0862d..f6c650f801ef8 100644 --- a/releases/release-notes.md +++ b/releases/release-notes.md @@ -11,6 +11,7 @@ aliases: ['/docs/dev/releases/release-notes/','/docs/dev/releases/rn/'] ## 4.0 +- [4.0.12](/releases/release-4.0.12.md) - [4.0.11](/releases/release-4.0.11.md) - [4.0.10](/releases/release-4.0.10.md) - [4.0.9](/releases/release-4.0.9.md) From 5ef3690e9f54519287c53cc6d3e41cdeb16896b4 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Fri, 2 Apr 2021 22:02:32 +0800 Subject: [PATCH 2/2] Apply suggestions from code review --- releases/release-4.0.12.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/releases/release-4.0.12.md b/releases/release-4.0.12.md index 281db900671ad..60d5e8344d25b 100644 --- a/releases/release-4.0.12.md +++ b/releases/release-4.0.12.md @@ -119,17 +119,10 @@ TiDB version: 4.0.12 + TiCDC - Fix a disorder issue of the `resolved ts` event [#1464](https://github.com/pingcap/ticdc/pull/1464) -<<<<<<< HEAD - Fix a data loss issue caused by wrong table scheduling due to the network problem [#1508](https://github.com/pingcap/ticdc/pull/1508) - Fix a bug of untimely release of resources after a processor is stopped [#1547](https://github.com/pingcap/ticdc/pull/1547) - Fix a bug that the transaction counter is not correctly updated, which might cause database connection leak [#1524](https://github.com/pingcap/ticdc/pull/1524) - Fix the issue that multiple owners can co-exist when PD has jitter, which might lead to table missing [#1540](https://github.com/pingcap/ticdc/pull/1540) -======= - - Fix a bug of untimely release of resources after a processor is stopped [#1547](https://github.com/pingcap/ticdc/pull/1547) - - Fix a bug that the transaction counter is not correctly updated, which might cause database connection leak [#1524](https://github.com/pingcap/ticdc/pull/1524) - - Fix the issue that multiple owners can co-exist when PD has jitter, which might lead to table missing [#1540](https://github.com/pingcap/ticdc/pull/1540) - - Fix a data loss issue caused by wrong table scheduling due to the network problem [#1508](https://github.com/pingcap/ticdc/pull/1508) ->>>>>>> 97069e7a... update tidb v4.0.12 release notes (#5090) (#5196) + Backup & Restore (BR)