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

MCOL-3536 collation

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

View File

@ -1091,9 +1091,8 @@ int main(int argc, char** argv)
#endif
setupSignalHandlers();
// Set up LOCALE - BUG 5362
std::string systemLang("C");
systemLang = funcexp::utf8::idb_setlocale();
// Set locale language
utf8::idb_setlocale();
// Initialize singleton instance of syslogging
if (argc > 0)
@ -1377,7 +1376,7 @@ int main(int argc, char** argv)
//--------------------------------------------------------------------------
task = TASK_LOAD_JOBFILE;
rc = curJob.loadJobInfo( sFileName.string(), bUseTempJobFile,
systemLang, argc, argv, bLogInfo2ToConsole, bValidateColumnList );
argc, argv, bLogInfo2ToConsole, bValidateColumnList );
if ( rc != NO_ERROR )
{