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

Merge branch 'develop-1.0' into 1.1-merge-up-20180118

This commit is contained in:
Andrew Hutchings
2018-01-18 16:28:08 +00:00
26 changed files with 213 additions and 17 deletions

View File

@ -98,6 +98,7 @@ using namespace querytele;
#include "boost/filesystem.hpp"
#include "threadpool.h"
#include "crashtrace.h"
namespace {
@ -515,7 +516,7 @@ public:
SJLP jl;
bool incSessionThreadCnt = true;
bool selfJoin = false;
bool selfJoin = false;
bool tryTuples = false;
bool usingTuples = false;
bool stmtCounted = false;