From 369aea884e02202ac6e5a7ef76e7bf61dd62a92b Mon Sep 17 00:00:00 2001
From: "david.hall" <david.hall@mariadb.com>
Date: Wed, 7 Dec 2022 09:52:00 -0600
Subject: [PATCH] MCOL-5311 Add timezone to jobList in subquerytransformer
 TimeZone was uninitialized in this scenario and led to undefined behavior.

---
 dbcon/joblist/jlf_common.h            | 1 +
 dbcon/joblist/subquerytransformer.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/dbcon/joblist/jlf_common.h b/dbcon/joblist/jlf_common.h
index a15b8e449..a2c7a4881 100644
--- a/dbcon/joblist/jlf_common.h
+++ b/dbcon/joblist/jlf_common.h
@@ -210,6 +210,7 @@ struct JobInfo
    , stringScanThreshold(1)
    , wfqLimitStart(0)
    , wfqLimitCount(-1)
+   , timeZone(0)
   {
   }
   ResourceManager* rm;
diff --git a/dbcon/joblist/subquerytransformer.cpp b/dbcon/joblist/subquerytransformer.cpp
index 48f1cc2d5..1596fff90 100644
--- a/dbcon/joblist/subquerytransformer.cpp
+++ b/dbcon/joblist/subquerytransformer.cpp
@@ -109,6 +109,8 @@ SJSTEP& SubQueryTransformer::makeSubQueryStep(execplan::CalpontSelectExecutionPl
   fSubJobInfo->stringTableThreshold = fOutJobInfo->stringTableThreshold;
   fSubJobInfo->localQuery = fOutJobInfo->localQuery;
   fSubJobInfo->uuid = fOutJobInfo->uuid;
+  fSubJobInfo->timeZone = fOutJobInfo->timeZone;
+
   fOutJobInfo->jobListPtr->addSubqueryJobList(fSubJobList);
 
   fSubJobInfo->smallSideLimit = fOutJobInfo->smallSideLimit;