From 13b7a794e451a20f4efb10c2cdef81d346f010ca Mon Sep 17 00:00:00 2001
From: David Hall <david.hall@mariadb.com>
Date: Fri, 19 Mar 2021 16:57:54 -0500
Subject: [PATCH] MCOL-4620 Add charset to various RowGroup initializers
 Specifically to operator+=

---
 utils/rowgroup/rowgroup.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/utils/rowgroup/rowgroup.cpp b/utils/rowgroup/rowgroup.cpp
index 9f31b6388..b2dacc98d 100644
--- a/utils/rowgroup/rowgroup.cpp
+++ b/utils/rowgroup/rowgroup.cpp
@@ -1253,6 +1253,8 @@ RowGroup::RowGroup() : columnCount(0), data(NULL), rgData(NULL), strings(NULL),
     oids.reserve(10);
     keys.reserve(10);
     types.reserve(10);
+    charsetNumbers.reserve(10);
+    charsets.reserve(10);
     scale.reserve(10);
     precision.reserve(10);
 }
@@ -1644,6 +1646,8 @@ RowGroup& RowGroup::operator+=(const RowGroup& rhs)
     oids.insert(oids.end(), rhs.oids.begin(), rhs.oids.end());
     keys.insert(keys.end(), rhs.keys.begin(), rhs.keys.end());
     types.insert(types.end(), rhs.types.begin(), rhs.types.end());
+    charsetNumbers.insert(charsetNumbers.end(), rhs.charsetNumbers.begin(), rhs.charsetNumbers.end());
+    charsets.insert(charsets.end(), rhs.charsets.begin(), rhs.charsets.end());
     scale.insert(scale.end(), rhs.scale.begin(), rhs.scale.end());
     precision.insert(precision.end(), rhs.precision.begin(), rhs.precision.end());
     colWidths.insert(colWidths.end(), rhs.colWidths.begin(), rhs.colWidths.end());
@@ -1894,6 +1898,8 @@ RowGroup RowGroup::truncate(uint32_t cols)
     ret.oids.resize(cols);
     ret.keys.resize(cols);
     ret.types.resize(cols);
+    ret.charsetNumbers.resize(cols);
+    ret.charsets.resize(cols);
     ret.scale.resize(cols);
     ret.precision.resize(cols);
     ret.forceInline.reset(new bool[cols]);