mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

IB: DICT_TF2_VERSIONED flag removed

Browse source 
Reverted DICT_TF2_BITS (midenok)
This commit is contained in:
Eugene Kosov 2017-11-01 20:17:48 +03:00 • committed by Aleksey Midenkov
commit e674806282
6 changed files with 25 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
storage/innobase/row/row0merge.cc
View file

@ -2241,8 +2241,7 @@ end_of_index:
< dict_table_get_n_user_cols(new_table));
bool historical_row = false;
if (DICT_TF2_FLAG_IS_SET(
new_table, DICT_TF2_VERSIONED)) {
if (new_table->with_versioning()) {
const dfield_t *dfield = dtuple_get_nth_field(
row, new_table->vers_row_end);
const byte *data = static_cast<const byte *>(
@ -2304,10 +2303,8 @@ end_of_index:
}
}
if (DICT_TF2_FLAG_IS_SET(old_table, DICT_TF2_VERSIONED)) {
if (DICT_TF2_FLAG_IS_SET(new_table,
DICT_TF2_VERSIONED) &&
!drop_historical) {
if (old_table->with_versioning()) {
if (new_table->with_versioning() && !drop_historical) {
dfield_t *end = dtuple_get_nth_field(
row, new_table->vers_row_end);
byte *data = static_cast<byte *>(
@ -2333,8 +2330,7 @@ end_of_index:
if (mach_read_from_8(sys_trx_end) != TRX_ID_MAX)
continue;
}
} else if (DICT_TF2_FLAG_IS_SET(
new_table, DICT_TF2_VERSIONED)) {
} else if (new_table->with_versioning()) {
void *sys_trx_start = mem_heap_alloc(row_heap, 8);
void *sys_trx_end = mem_heap_alloc(row_heap, 8);
mach_write_to_8(sys_trx_start, trx->id);