This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new f05756280ae Fix rebase issue with pg_dump
f05756280ae is described below
commit f05756280aedd90b5c71cedc0c59a0edd0453393
Author: reshke <[email protected]>
AuthorDate: Wed Dec 24 10:14:43 2025 +0000
Fix rebase issue with pg_dump
use our newly-preferred "pg_malloc_object"
---
src/bin/pg_dump/common.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 26587cc5eaa..2005c3d9ea2 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -622,11 +622,7 @@ flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int
numTables)
{
AttrDefInfo *attrDef;
-<<<<<<< HEAD
- attrDef = (AttrDefInfo *)
malloc(sizeof(AttrDefInfo));
-=======
attrDef = pg_malloc_object(AttrDefInfo);
->>>>>>> REL_16_9
attrDef->dobj.objType = DO_ATTRDEF;
attrDef->dobj.catId.tableoid = 0;
attrDef->dobj.catId.oid = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
