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

Merge branch 'develop-1.1' into 1.1-merge-up-2018-10-05

Browse Source
This commit is contained in:
Andrew Hutchings
2018-10-05 18:40:07 +01:00
parent c0600d0da0 e183557b67
commit f1f13a09d1
22 changed files with 625 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dmlproc/dmlprocessor.cpp
View File

@ -1225,8 +1225,28 @@ void DMLServer::start()
cancelThread.join();
}
catch (std::exception& ex)
{
cerr << ex.what() << endl;
logging::LoggingID lid(21);
Message::Args args;
Message message(8);
args.add("DMLProc init caught exception: ");
args.add(ex.what());
message.format(args);
logging::Logger logger(lid.fSubsysID);
logger.logMessage(logging::LOG_TYPE_CRITICAL, message, lid);
}
catch (...)
{
cerr << "Caught unknown exception!" << endl;
logging::LoggingID lid(21);
Message::Args args;
Message message(8);
args.add("DMLProc init caught unknown exception");
message.format(args);
logging::Logger logger(lid.fSubsysID);
logger.logMessage(logging::LOG_TYPE_CRITICAL, message, lid);
}
}