database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-3536 collation

Browse Source
This commit is contained in:
David Hall
2020-05-14 16:02:49 -05:00
parent 04fdacb927
commit 1f3d1e6fd6
41 changed files with 667 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/configMgt/autoConfigure.cpp
View File

@ -372,23 +372,6 @@ int main(int argc, char* argv[])
catch (...)
{ }
//setup System Language
string systemLang = "C";
try
{
systemLang = sysConfigOld->getConfig(SystemSection, "SystemLang");
}
catch (...)
{ }
try
{
sysConfigNew->setConfig(SystemSection, "SystemLang", systemLang);
}
catch (...)
{}
//setup HA IP Address
string HA_IPadd;

1
tools/pingproc/pingproc.cpp
View File

@ -466,6 +466,7 @@ const ByteStream formatDictionaryScanMsg(const uint64_t lbid,
hdr.COP2 = oidOp.COP2();
hdr.NVALS = oidOp.FilterCount();
hdr.Count = count;
hdr.charsetNumber = oidOp.ColumnType().charsetNumber;
idbassert(hdr.Count > 0);
primMsg.load((const uint8_t*) &hdr.ism, sizeof(ISMPacketHeader));