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

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

Browse Source
This commit is contained in:
Andrew Hutchings
2017-11-30 15:09:11 +00:00
parent 4d8026618c a3d81dd65e
commit 37f673d121
10 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -38,6 +38,7 @@
#include <cerrno>
#include <cstring>
#include <time.h>
//#define NDEBUG
#include <cassert>
#include <vector>
#include <map>
@ -2289,6 +2290,8 @@ CalpontSystemCatalog::ColType colType_MysqlToIDB (const Item* item)
{
if (ct.colWidth < 20)
ct.colWidth = 20; // for infinidb date length
if (ct.colWidth > 65535)
ct.colWidth = 65535;
}
// @bug5083. MySQL gives string type for date/datetime column.
// need to adjust here.
@ -6491,8 +6494,8 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
if (!isUnion && !gwi.hasWindowFunc && gwi.subSelectType == CalpontSelectExecutionPlan::MAIN_SELECT)
{
std::ostringstream vtb;
vtb << "infinidb_vtable.$vtable_" << gwi.thd->thread_id;
//vtb << "$vtable_" << gwi.thd->thread_id;
vtb << "infinidb_vtable.$vtable_" << gwi.thd->thread_id;
//vtb << "$vtable_" << gwi.thd->thread_id;
// re-construct the select query and redo phase 1
if (redo)
{