summaryrefslogtreecommitdiff
path: root/sql/sql_partition.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-01-08 18:03:55 +0100
committerAleksey Midenkov <midenok@gmail.com>2018-01-09 15:49:07 +0300
commitb85efdc3af902617ec6e238135624973472c2ee9 (patch)
tree35e7fa8ff90ae1ee352a7d4ff209648b77b101f9 /sql/sql_partition.cc
parentcf1e5bef59767c2aaddb2657f5cf7c95b953c834 (diff)
downloadmariadb-git-b85efdc3af902617ec6e238135624973472c2ee9.tar.gz
rename system_time columns
sys_trx_start -> row_start sys_trx_end -> row_end
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r--sql/sql_partition.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 2091ec0340d..24cd5fc5123 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -3161,19 +3161,19 @@ int vers_get_partition_id(partition_info *part_info,
{
DBUG_ENTER("vers_get_partition_id");
DBUG_ASSERT(part_info);
- Field *sys_trx_end= part_info->part_field_array[STAT_TRX_END];
- DBUG_ASSERT(sys_trx_end);
+ Field *row_end= part_info->part_field_array[STAT_TRX_END];
+ DBUG_ASSERT(row_end);
TABLE *table= part_info->table;
DBUG_ASSERT(table);
Vers_part_info *vers_info= part_info->vers_info;
DBUG_ASSERT(vers_info);
DBUG_ASSERT(vers_info->initialized());
- DBUG_ASSERT(sys_trx_end->table == table);
+ DBUG_ASSERT(row_end->table == table);
DBUG_ASSERT(table->versioned());
- DBUG_ASSERT(table->vers_end_field() == sys_trx_end);
+ DBUG_ASSERT(table->vers_end_field() == row_end);
- // new rows have NULL in sys_trx_end
- if (sys_trx_end->is_max() || sys_trx_end->is_null())
+ // new rows have NULL in row_end
+ if (row_end->is_max() || row_end->is_null())
{
*part_id= vers_info->now_part->id;
}
@@ -3200,8 +3200,8 @@ int vers_get_partition_id(partition_info *part_info,
mysql_mutex_unlock(&table->s->LOCK_rotation);
// transaction is not yet pushed to VTQ, so we use now-time
ulong sec_part;
- my_time_t end_ts= sys_trx_end->table->versioned(VERS_TRX_ID) ?
- my_time_t(0) : sys_trx_end->get_timestamp(&sec_part);
+ my_time_t end_ts= row_end->table->versioned(VERS_TRX_ID) ?
+ my_time_t(0) : row_end->get_timestamp(&sec_part);
if (part_info->vers_limit_exceed() || part_info->vers_interval_exceed(end_ts))
{
part_info->vers_part_rotate(thd);