1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Merge pull request #1942 from mariadb-corporation/bar-develop-compile-10.6

Fixing 10.6 + develop compilation failure
This commit is contained in:
Roman Nozdrin
2021-05-25 14:31:37 +03:00
committed by GitHub
92 changed files with 203 additions and 127 deletions

View File

@ -64,7 +64,6 @@ using namespace primitiveprocessor;
#include "liboamcpp.h"
using namespace oam;
#include "utils_utf8.h"
#include "IDBPolicy.h"
using namespace idbdatafile;
@ -806,7 +805,7 @@ int main(int argc, char** argv)
// This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("PrimProc");
// Initialize the charset library
my_init();
MY_INIT(argv[0]);
return ServicePrimProc(opt).Run();
}