From c67f70f38551d21af2a4cdf672764e45cdc7ca06 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Thu, 22 Apr 2021 10:46:26 +0400
Subject: [PATCH] MCOL-4689 [135B blob data] in PrimPrim jounralctl records

---
 dbcon/mysql/ha_mcs_execplan.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp
index 243a1b389..fe896f774 100755
--- a/dbcon/mysql/ha_mcs_execplan.cpp
+++ b/dbcon/mysql/ha_mcs_execplan.cpp
@@ -2984,6 +2984,7 @@ SimpleColumn* getSmallestColumn(boost::shared_ptr<CalpontSystemCatalog> csc,
     }
 
     CalpontSystemCatalog::RIDList oidlist = csc->columnRIDs(tn, true);
+    idbassert(oidlist.size() == table->s->fields);
     CalpontSystemCatalog::TableColName tcn;
     int minColWidth = -1;
     int minWidthColOffset = 0;
@@ -3008,7 +3009,7 @@ SimpleColumn* getSmallestColumn(boost::shared_ptr<CalpontSystemCatalog> csc,
     sc->viewName(tan.view);
     sc->timeZone(gwi.thd->variables.time_zone->get_name()->ptr());
     sc->resultType(csc->colType(oidlist[minWidthColOffset].objnum));
-    sc->charsetNumber(3000);
+    sc->charsetNumber(table->field[minWidthColOffset]->charset()->number);
     return sc;
 }