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
commit 9cce7148af17fce91ffbb4ba2136461537bb0ea7 Author: reshke <[email protected]> AuthorDate: Wed Dec 24 13:31:01 2025 +0000 Fix rebase conflict with 2258e76 --- src/bin/pg_waldump/pg_waldump.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c index 5f873728495..734e8d6bef8 100644 --- a/src/bin/pg_waldump/pg_waldump.c +++ b/src/bin/pg_waldump/pg_waldump.c @@ -90,27 +90,9 @@ typedef struct XLogDumpConfig static void sigint_handler(SIGNAL_ARGS) { -<<<<<<< HEAD - uint64 count; - uint64 rec_len; - uint64 fpi_len; -} Stats; - -#define MAX_XLINFO_TYPES 16 - -typedef struct XLogDumpStats -{ - uint64 count; - Stats rmgr_stats[RM_MAX_ID + 1]; - Stats record_stats[RM_MAX_ID + 1][MAX_XLINFO_TYPES]; -} XLogDumpStats; - -#define fatal_error(...) do { pg_log_fatal(__VA_ARGS__); exit(EXIT_FAILURE); } while(0) -======= time_to_stop = true; } #endif ->>>>>>> REL_16_9 static void print_rmgr_list(void) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
