mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 14:32:34 +01:00
branches/zip: mlog_parse_index(): After merge fix (r841):
Identify DB_TRX_ID and DB_ROLL_PTR in the index.
This commit is contained in:
parent
a1bca48c85
commit
7f057a4b18
1 changed files with 13 additions and 0 deletions
|
@ -601,6 +601,19 @@ mlog_parse_index(
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
dict_table_add_system_columns(table);
|
dict_table_add_system_columns(table);
|
||||||
|
if (n_uniq != n) {
|
||||||
|
/* Identify DB_TRX_ID and DB_ROLL_PTR in the index. */
|
||||||
|
ut_a(DATA_TRX_ID_LEN
|
||||||
|
== dict_index_get_nth_col(ind, DATA_TRX_ID - 1
|
||||||
|
+ n_uniq)->len);
|
||||||
|
ut_a(DATA_ROLL_PTR_LEN
|
||||||
|
== dict_index_get_nth_col(ind, DATA_ROLL_PTR - 1
|
||||||
|
+ n_uniq)->len);
|
||||||
|
ind->fields[DATA_TRX_ID - 1 + n_uniq].col
|
||||||
|
= &table->cols[n + DATA_TRX_ID];
|
||||||
|
ind->fields[DATA_ROLL_PTR - 1 + n_uniq].col
|
||||||
|
= &table->cols[n + DATA_ROLL_PTR];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* avoid ut_ad(index->cached) in dict_index_get_n_unique_in_tree */
|
/* avoid ut_ad(index->cached) in dict_index_get_n_unique_in_tree */
|
||||||
ind->cached = TRUE;
|
ind->cached = TRUE;
|
||||||
|
|
Loading…
Reference in a new issue