Merge remote-tracking branch 'upstream/main' into gokhangulbiz/tenant-stats-perf-improvements

pull/6868/head
Gokhan Gulbiz 2023-05-10 13:01:53 +03:00
commit 5027321af0
No known key found for this signature in database
GPG Key ID: 608EF06B6BD1B45B
1 changed files with 7 additions and 0 deletions

View File

@ -213,6 +213,7 @@ static bool IsSuperuser(char *userName);
static void AdjustDynamicLibraryPathForCdcDecoders(void);
static ClientAuthentication_hook_type original_client_auth_hook = NULL;
static emit_log_hook_type original_emit_log_hook = NULL;
/* *INDENT-OFF* */
/* GUC enum definitions */
@ -458,6 +459,7 @@ _PG_init(void)
ExecutorEnd_hook = CitusAttributeToEnd;
/* register hook for error messages */
original_emit_log_hook = emit_log_hook;
emit_log_hook = multi_log_hook;
@ -698,6 +700,11 @@ multi_log_hook(ErrorData *edata)
edata->message = pstrdup("canceling the transaction since it was "
"involved in a distributed deadlock");
}
if (original_emit_log_hook)
{
original_emit_log_hook(edata);
}
}