1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-05 15:41:14 +03:00

Merge branch 'develop-1.1' into 1.1-merge-up-20180817

This commit is contained in:
Andrew Hutchings
2018-08-17 16:17:13 +01:00
47 changed files with 1526 additions and 756 deletions

View File

@ -1443,7 +1443,9 @@ int main(int argc, char* argv[])
#endif
setupSignalHandlers();
int err = setupResources();
int err = 0;
if (!gDebug)
err = setupResources();
string errMsg;
switch (err)