1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00

Merge branch 'develop' into MCOL-3536

This commit is contained in:
David Hall
2020-05-28 14:20:32 -05:00
28 changed files with 300 additions and 256 deletions

View File

@@ -644,7 +644,11 @@ new_plan:
std::cout << "### For session id " << csep.sessionID() << ", got a CSEP" << std::endl;
setRMParms(csep.rmParms());
// Re-establish lost PP connections.
if (UNLIKELY(fEc->getNumConnections() != fEc->connectedPmServers()))
{
fEc->Setup();
}
// @bug 1021. try to get schema cache for a come in query.
// skip system catalog queries.
if (!csep.isInternal())
@@ -1647,7 +1651,7 @@ int main(int argc, char* argv[])
{
}
}
if (getenv("SKIP_OAM_INIT"))
{
BRM::DBRM *dbrm = new BRM::DBRM();
dbrm->setSystemQueryReady(true);