From 1253837d9433fa4c8e63a3b2f4d68c0dd64ddc77 Mon Sep 17 00:00:00 2001
From: "Na, Hyunik" <hyunikn@gmail.com>
Date: Thu, 28 Nov 2024 13:55:46 +0900
Subject: [PATCH] get server message after all the execution results are read

---
 CTP/sql_by_cci/execute.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/CTP/sql_by_cci/execute.c b/CTP/sql_by_cci/execute.c
index c9019099..183853fe 100644
--- a/CTP/sql_by_cci/execute.c
+++ b/CTP/sql_by_cci/execute.c
@@ -1937,6 +1937,7 @@ execute (FILE * fp, char conn, const SqlStateStruce *pSqlState)
   bool hasqueryplan = pSqlState->hasqp;
   bool onlyjoingraph = pSqlState->onlyjg;
   bool hasfullplan = pSqlState->hasfullp;
+  bool executed = false;
 
   fprintf (fp, "===================================================\n");
 
@@ -1959,10 +1960,7 @@ execute (FILE * fp, char conn, const SqlStateStruce *pSqlState)
     }
 
   res = cci_execute (req, CCI_EXEC_QUERY_ALL, 0, &error);
-  if (is_server_message_on)
-    {
-      server_output_buffer = get_server_output (fp, conn);
-    }
+  executed = true;
   if (res < 0)
     {
       fprintf (stdout, "Error:%d\n", error.err_code);
@@ -2055,9 +2053,13 @@ execute (FILE * fp, char conn, const SqlStateStruce *pSqlState)
     }
 
 _END:
-  if (server_output_buffer)
+  if (executed && is_server_message_on)
     {
-      fprintf (fp, "%s", server_output_buffer);
+      server_output_buffer = get_server_output (fp, conn);
+      if (server_output_buffer)
+        {
+          fprintf (fp, "%s", server_output_buffer);
+        }
     }
   if (req > 0)
     cci_close_req_handle (req);
@@ -2085,6 +2087,8 @@ executebind (FILE * fp, char conn, char *param, const SqlStateStruce *pSqlState)
   bool onlyjoingraph = pSqlState->onlyjg;
   bool hasfullplan = pSqlState->hasfullp;
   bool iscall = pSqlState->iscallwithoutvalue;
+  bool executed = false;
+
   fprintf (fp, "===================================================\n");
 
   if (iscall)
@@ -2133,10 +2137,7 @@ executebind (FILE * fp, char conn, char *param, const SqlStateStruce *pSqlState)
     }
 
   res = cci_execute (req, CCI_EXEC_QUERY_ALL, 0, &error);
-  if (is_server_message_on)
-    {
-      server_output_buffer = get_server_output (fp, conn);
-    }
+  executed = true;
   if (res < 0)
     {
       fprintf (stdout, "Error:%d\n", error.err_code);
@@ -2238,9 +2239,13 @@ executebind (FILE * fp, char conn, char *param, const SqlStateStruce *pSqlState)
     }
 
 _END:
-  if (server_output_buffer)
+  if (executed && is_server_message_on)
     {
-      fprintf (fp, "%s", server_output_buffer);
+      server_output_buffer = get_server_output (fp, conn);
+      if (server_output_buffer)
+        {
+          fprintf (fp, "%s", server_output_buffer);
+        }
     }
   if (req > 0)
     cci_close_req_handle (req);