Skip to content

Backpatch 14.5-14.6 changes to REL_2_STABLE #1636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reshke merged 13 commits into from
Mar 25, 2026
+1,478 −583
Merged

Backpatch 14.5-14.6 changes to REL_2_STABLE #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
11e0e64
pg_basebackup: Fix cross-platform tablespace relocation.
robertmhaas Oct 21, 2022
b4a6571
Fix ordering issue with WAL operations in GIN fast insert path
michaelpq Oct 26, 2022
b518c8d
pg_stat_statements: fetch stmt location/length before it disappears.
tglsfdc Nov 1, 2022
af18d45
Update time zone data files to tzdata release 2022f.
tglsfdc Nov 1, 2022
177612b
Fix copy-and-pasteo in comment.
Nov 2, 2022
2cb0b32
Defend against unsupported partition relkind in logical replication w…
tglsfdc Nov 2, 2022
e0f5841
Allow use of __sync_lock_test_and_set for spinlocks on any machine.
tglsfdc Nov 2, 2022
3bd936a
Add casts to simplehash.h to silence C++ warnings.
tglsfdc Nov 3, 2022
b8c89eb
Avoid crash after function syntax error in a replication worker.
tglsfdc Nov 3, 2022
c4199e8
Create FKs properly when attaching table as partition
alvherre Nov 3, 2022
7626447
Correct error message for row-level triggers with transition tables o…
Nov 4, 2022
a017c7e
Bump PostgreSQL kernel minor version.
reshke Mar 24, 2026
7ad1900
Release notes for 15.1, 14.6, 13.9, 12.13, 11.18, 10.23.
tglsfdc Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2920,7 +2920,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu


PG_PACKAGE_VERSION=14.5
PG_PACKAGE_VERSION=14.6



Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dnl The PACKAGE_VERSION from upstream PostgreSQL is maintained in the
dnl PG_PACKAGE_VERSION variable, when merging make sure to update this
dnl variable with the merge conflict from the AC_INIT() statement.
AC_INIT([Apache Cloudberry], [2.1.0-incubating], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/])
[PG_PACKAGE_VERSION=14.5]
[PG_PACKAGE_VERSION=14.6]
AC_SUBST(PG_PACKAGE_VERSION)

dnl m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
Expand Down
16 changes: 14 additions & 2 deletions contrib/pg_stat_statements/pg_stat_statements.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,8 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
{
Node *parsetree = pstmt->utilityStmt;
uint64 saved_queryId = pstmt->queryId;
int saved_stmt_location = pstmt->stmt_location;
int saved_stmt_len = pstmt->stmt_len;

/*
* Force utility statements to get queryId zero. We do this even in cases
Expand Down Expand Up @@ -1145,6 +1147,16 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
}
PG_END_TRY();

/*
* CAUTION: do not access the *pstmt data structure again below here.
* If it was a ROLLBACK or similar, that data structure may have been
* freed. We must copy everything we still need into local variables,
* which we did above.
*
* For the same reason, we can't risk restoring pstmt->queryId to its
* former value, which'd otherwise be a good idea.
*/

INSTR_TIME_SET_CURRENT(duration);
INSTR_TIME_SUBTRACT(duration, start);

Expand All @@ -1170,8 +1182,8 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,

pgss_store(queryString,
saved_queryId,
pstmt->stmt_location,
pstmt->stmt_len,
saved_stmt_location,
saved_stmt_len,
PGSS_EXEC,
INSTR_TIME_GET_MILLISEC(duration),
rows,
Expand Down
Loading
Loading