forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit240067b
committed
Merge synchronous_replication setting into synchronous_commit.
This means one less thing to configure when setting up synchronousreplication, and also avoids some ambiguity around what the behaviorshould be when the settings of these variables conflict.Fujii Masao, with additional hacking by me.1 parentfc3459d commit240067b
File tree
10 files changed
+91
-104
lines changed- doc/src/sgml
- src
- backend
- access/transam
- postmaster
- replication
- utils/misc
- include
- access
- replication
10 files changed
+91
-104
lines changedLines changed: 24 additions & 44 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1507 | 1507 |
| |
1508 | 1508 |
| |
1509 | 1509 |
| |
1510 |
| - | |
1511 |
| - | |
| 1510 | + | |
| 1511 | + | |
| 1512 | + | |
1512 | 1513 |
| |
1513 | 1514 |
| |
1514 | 1515 |
| |
| |||
1522 | 1523 |
| |
1523 | 1524 |
| |
1524 | 1525 |
| |
| 1526 | + | |
| 1527 | + | |
| 1528 | + | |
| 1529 | + | |
| 1530 | + | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
| 1535 | + | |
| 1536 | + | |
| 1537 | + | |
| 1538 | + | |
1525 | 1539 |
| |
1526 | 1540 |
| |
1527 | 1541 |
| |
| |||
2057 | 2071 |
| |
2058 | 2072 |
| |
2059 | 2073 |
| |
2060 |
| - | |
2061 |
| - | |
2062 |
| - | |
2063 |
| - | |
2064 |
| - | |
2065 |
| - | |
2066 |
| - | |
2067 |
| - | |
2068 |
| - | |
2069 |
| - | |
2070 |
| - | |
2071 |
| - | |
2072 |
| - | |
2073 |
| - | |
2074 |
| - | |
2075 |
| - | |
2076 |
| - | |
2077 |
| - | |
2078 |
| - | |
2079 |
| - | |
2080 |
| - | |
2081 |
| - | |
2082 |
| - | |
2083 |
| - | |
2084 |
| - | |
2085 |
| - | |
2086 |
| - | |
2087 |
| - | |
2088 |
| - | |
2089 |
| - | |
2090 |
| - | |
2091 |
| - | |
2092 |
| - | |
2093 | 2074 |
| |
2094 | 2075 |
| |
2095 | 2076 |
| |
| |||
2098 | 2079 |
| |
2099 | 2080 |
| |
2100 | 2081 |
| |
2101 |
| - | |
| 2082 | + | |
2102 | 2083 |
| |
2103 | 2084 |
| |
2104 | 2085 |
| |
| |||
2114 | 2095 |
| |
2115 | 2096 |
| |
2116 | 2097 |
| |
2117 |
| - | |
2118 |
| - | |
2119 |
| - | |
2120 | 2098 |
| |
2121 | 2099 |
| |
2122 | 2100 |
| |
2123 | 2101 |
| |
2124 |
| - | |
2125 |
| - | |
2126 |
| - | |
2127 |
| - | |
2128 |
| - | |
| 2102 | + | |
| 2103 | + | |
| 2104 | + | |
| 2105 | + | |
| 2106 | + | |
| 2107 | + | |
| 2108 | + | |
2129 | 2109 |
| |
2130 | 2110 |
| |
2131 | 2111 |
| |
|
Lines changed: 20 additions & 28 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
929 | 929 |
| |
930 | 930 |
| |
931 | 931 |
| |
932 |
| - | |
933 |
| - | |
934 |
| - | |
935 |
| - | |
936 |
| - | |
937 |
| - | |
938 |
| - | |
939 |
| - | |
940 |
| - | |
941 |
| - | |
942 |
| - | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
943 | 941 |
| |
944 |
| - | |
| 942 | + | |
| 943 | + | |
945 | 944 |
| |
946 | 945 |
| |
947 | 946 |
| |
| |||
959 | 958 |
| |
960 | 959 |
| |
961 | 960 |
| |
962 |
| - | |
963 |
| - | |
964 |
| - | |
965 |
| - | |
966 |
| - | |
967 |
| - | |
968 |
| - | |
969 |
| - | |
970 |
| - | |
971 |
| - | |
972 |
| - | |
| 961 | + | |
| 962 | + | |
| 963 | + | |
| 964 | + | |
973 | 965 |
| |
974 | 966 |
| |
975 | 967 |
| |
| |||
1019 | 1011 |
| |
1020 | 1012 |
| |
1021 | 1013 |
| |
1022 |
| - | |
1023 |
| - | |
1024 |
| - | |
| 1014 | + | |
| 1015 | + | |
| 1016 | + | |
1025 | 1017 |
| |
1026 | 1018 |
| |
1027 | 1019 |
| |
| |||
1073 | 1065 |
| |
1074 | 1066 |
| |
1075 | 1067 |
| |
1076 |
| - | |
1077 |
| - | |
| 1068 | + | |
| 1069 | + | |
1078 | 1070 |
| |
1079 | 1071 |
| |
1080 | 1072 |
| |
|
Lines changed: 4 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
651 | 651 |
| |
652 | 652 |
| |
653 | 653 |
| |
| 654 | + | |
| 655 | + | |
654 | 656 |
| |
655 | 657 |
| |
656 | 658 |
| |
657 | 659 |
| |
658 | 660 |
| |
659 |
| - | |
660 |
| - | |
661 |
| - | |
| 661 | + | |
| 662 | + | |
662 | 663 |
| |
663 | 664 |
| |
664 | 665 |
| |
|
Lines changed: 3 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
68 | 68 |
| |
69 | 69 |
| |
70 | 70 |
| |
71 |
| - | |
| 71 | + | |
72 | 72 |
| |
73 | 73 |
| |
74 | 74 |
| |
| |||
1056 | 1056 |
| |
1057 | 1057 |
| |
1058 | 1058 |
| |
1059 |
| - | |
| 1059 | + | |
| 1060 | + | |
1060 | 1061 |
| |
1061 | 1062 |
| |
1062 | 1063 |
| |
|
Lines changed: 2 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1531 | 1531 |
| |
1532 | 1532 |
| |
1533 | 1533 |
| |
1534 |
| - | |
| 1534 | + | |
| 1535 | + | |
1535 | 1536 |
| |
1536 | 1537 |
| |
1537 | 1538 |
| |
|
Lines changed: 0 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
63 | 63 |
| |
64 | 64 |
| |
65 | 65 |
| |
66 |
| - | |
67 | 66 |
| |
68 | 67 |
| |
69 | 68 |
| |
|
Lines changed: 27 additions & 16 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
350 | 350 |
| |
351 | 351 |
| |
352 | 352 |
| |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
353 | 370 |
| |
354 | 371 |
| |
355 | 372 |
| |
| |||
746 | 763 |
| |
747 | 764 |
| |
748 | 765 |
| |
749 |
| - | |
750 |
| - | |
751 |
| - | |
752 |
| - | |
753 |
| - | |
754 |
| - | |
755 |
| - | |
756 |
| - | |
757 |
| - | |
758 |
| - | |
759 |
| - | |
760 |
| - | |
761 |
| - | |
762 |
| - | |
763 |
| - | |
764 |
| - | |
765 | 766 |
| |
766 | 767 |
| |
767 | 768 |
| |
| |||
2908 | 2909 |
| |
2909 | 2910 |
| |
2910 | 2911 |
| |
| 2912 | + | |
| 2913 | + | |
| 2914 | + | |
| 2915 | + | |
| 2916 | + | |
| 2917 | + | |
| 2918 | + | |
| 2919 | + | |
| 2920 | + | |
| 2921 | + | |
2911 | 2922 |
| |
2912 | 2923 |
| |
2913 | 2924 |
| |
|
Lines changed: 1 addition & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
153 | 153 |
| |
154 | 154 |
| |
155 | 155 |
| |
156 |
| - | |
| 156 | + | |
157 | 157 |
| |
158 | 158 |
| |
159 | 159 |
| |
| |||
184 | 184 |
| |
185 | 185 |
| |
186 | 186 |
| |
187 |
| - | |
188 |
| - | |
189 |
| - | |
190 |
| - | |
191 | 187 |
| |
192 | 188 |
| |
193 | 189 |
| |
|
Lines changed: 9 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
52 | 52 |
| |
53 | 53 |
| |
54 | 54 |
| |
55 |
| - | |
56 |
| - | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
57 | 64 |
| |
58 | 65 |
| |
59 | 66 |
| |
|
Lines changed: 1 addition & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
23 |
| - | |
| 23 | + | |
24 | 24 |
| |
25 | 25 |
| |
26 | 26 |
| |
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
32 | 31 |
| |
33 | 32 |
| |
34 | 33 |
| |
|
0 commit comments
Comments
(0)