diff options
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 2885642a2bb..72de82dc5d1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -924,8 +924,6 @@ int vers_setup_select(THD *thd, TABLE_LIST *tables, COND **where_expr, else { DBUG_ASSERT(table->table->s && table->table->s->db_plugin); - handlerton *hton= plugin_hton(table->table->s->db_plugin); - DBUG_ASSERT(hton); Item *trx_id0, *trx_id1; @@ -937,27 +935,27 @@ int vers_setup_select(THD *thd, TABLE_LIST *tables, COND **where_expr, break; case FOR_SYSTEM_TIME_AS_OF: trx_id0= vers_conditions.unit_start == UNIT_TIMESTAMP ? - newx Item_func_vtq_id(thd, hton, vers_conditions.start, VTQ_TRX_ID) : + newx Item_func_vtq_id(thd, vers_conditions.start, TR_table::FLD_TRX_ID) : vers_conditions.start; - cond1= newx Item_func_vtq_trx_sees_eq(thd, hton, trx_id0, row_start); - cond2= newx Item_func_vtq_trx_sees(thd, hton, row_end, trx_id0); + cond1= newx Item_func_vtq_trx_sees_eq(thd, trx_id0, row_start); + cond2= newx Item_func_vtq_trx_sees(thd, row_end, trx_id0); break; case FOR_SYSTEM_TIME_FROM_TO: case FOR_SYSTEM_TIME_BETWEEN: trx_id0= vers_conditions.unit_start == UNIT_TIMESTAMP ? - newx Item_func_vtq_id(thd, hton, vers_conditions.start, VTQ_TRX_ID, true) : + newx Item_func_vtq_id(thd, vers_conditions.start, TR_table::FLD_TRX_ID, true) : vers_conditions.start; trx_id1= vers_conditions.unit_end == UNIT_TIMESTAMP ? - newx Item_func_vtq_id(thd, hton, vers_conditions.end, VTQ_TRX_ID, false) : + newx Item_func_vtq_id(thd, vers_conditions.end, TR_table::FLD_TRX_ID, false) : vers_conditions.end; cond1= vers_conditions.type == FOR_SYSTEM_TIME_FROM_TO ? - newx Item_func_vtq_trx_sees(thd, hton, trx_id1, row_start) : - newx Item_func_vtq_trx_sees_eq(thd, hton, trx_id1, row_start); - cond2= newx Item_func_vtq_trx_sees_eq(thd, hton, row_end, trx_id0); + newx Item_func_vtq_trx_sees(thd, trx_id1, row_start) : + newx Item_func_vtq_trx_sees_eq(thd, trx_id1, row_start); + cond2= newx Item_func_vtq_trx_sees_eq(thd, row_end, trx_id0); break; case FOR_SYSTEM_TIME_BEFORE: trx_id0= vers_conditions.unit_start == UNIT_TIMESTAMP ? - newx Item_func_vtq_id(thd, hton, vers_conditions.start, VTQ_TRX_ID) : + newx Item_func_vtq_id(thd, vers_conditions.start, TR_table::FLD_TRX_ID) : vers_conditions.start; cond1= newx Item_func_lt(thd, row_end, trx_id0); break; |