database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-18 13:54:11 +03:00
Code Activity

Merge pull request #1878 from mariadb-corporation/bar-develop-MCOL-4689

Browse Source 
MCOL-4689 [135B blob data] in PrimPrim jounralctl records
This commit is contained in:
Roman Nozdrin
2021-04-22 18:13:38 +03:00
committed by GitHub
parent 1f46baa980 c67f70f385
commit 8cc9eb4024
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/mysql/ha_mcs_execplan.cpp
View File

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