database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-05-30 00:27:08 +03:00
Code

Merge pull request #319 from mariadb-corporation/MCOL-963

Browse Source 
MCOL-963 fix for regressions introduced
This commit is contained in:
Andrew Hutchings 2017-11-14 21:55:01 +00:00 committed by GitHub
commit dadcd6e969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -6488,7 +6488,6 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
// re-construct the select query and redo phase 1
if (redo)
{
++gwi.thd->infinidb_vtable.redo_count;
// select now() from region case. returnedCols should have minSc.
if (sel_cols_in_create.length() == 0)
{

11
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -2838,10 +2838,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
// set query state to be in_process. Sometimes mysql calls rnd_init multiple
// times, this makes sure plan only being generated and sent once. It will be
// reset when query finishes in sm::end_query
if (thd->infinidb_vtable.vtable_state == THD::INFINIDB_CREATE_VTABLE)
{
thd->infinidb_vtable.isNewQuery = false;
}
thd->infinidb_vtable.isNewQuery = false;
// common path for both vtable select phase and table mode -- open scan handle
ti = ci->tableMap[table];
@ -3077,8 +3074,8 @@ int ha_calpont_impl_rnd_end(TABLE* table)
thd->infinidb_vtable.vtable_state = THD::INFINIDB_SELECT_VTABLE; // flip back to normal state
return rc;
}
if (thd->infinidb_vtable.vtable_state == THD::INFINIDB_REDO_PHASE1)
return rc;
// if (thd->infinidb_vtable.vtable_state == THD::INFINIDB_REDO_PHASE1)
// return rc;
if ( (thd->lex)->sql_command == SQLCOM_ALTER_TABLE )
return rc;
@ -3095,7 +3092,7 @@ int ha_calpont_impl_rnd_end(TABLE* table)
// @bug 4022. error handling for select part of dml
if (ci->cal_conn_hndl && ci->rc)
{
// send ExeMgr a signal before cloing the connection
// send ExeMgr a signal before closing the connection
ByteStream msg;
ByteStream::quadbyte qb = 0;
msg << qb;