Commit 146fe8c1 authored by Marko Mäkelä's avatar Marko Mäkelä

Introduce the dtuple_t::info_bits constant REC_INFO_DEFAULT_ROW

parent acd66eed
......@@ -4347,7 +4347,7 @@ innobase_add_instant_try(
pars_info_add_int4_literal(info, "id", user_table->id);
dtuple_t* entry = row_build_index_entry(row, NULL, index, ctx->heap);
entry->info_bits = REC_INFO_MIN_REC_FLAG | REC_STATUS_COLUMNS_ADDED;
entry->info_bits = REC_INFO_DEFAULT_ROW;
dberr_t err = que_eval_sql(
info,
......
......@@ -70,6 +70,11 @@ enum rec_comp_status_t {
REC_STATUS_COLUMNS_ADDED = 4
};
/** The dtuple_t::info_bits of the 'default row' record.
@see rec_is_default_row() */
static const byte REC_INFO_DEFAULT_ROW
= REC_INFO_MIN_REC_FLAG | REC_STATUS_COLUMNS_ADDED;
#define REC_NEW_STATUS 3 /* This is single byte bit-field */
#define REC_NEW_STATUS_MASK 0x7UL
#define REC_NEW_STATUS_SHIFT 0
......
......@@ -2634,8 +2634,7 @@ row_ins_clust_index_entry_low(
#endif /* UNIV_DEBUG */
if (entry->info_bits) {
ut_ad(entry->info_bits
== (REC_INFO_MIN_REC_FLAG | REC_STATUS_COLUMNS_ADDED));
ut_ad(entry->info_bits == REC_INFO_DEFAULT_ROW);
ut_ad(flags == BTR_NO_LOCKING_FLAG);
ut_ad(index->is_instant());
ut_ad(!dict_index_is_online_ddl(index));
......
......@@ -500,8 +500,7 @@ trx_undo_page_report_insert(
/* Store then the fields required to uniquely determine the record
to be inserted in the clustered index */
if (UNIV_UNLIKELY(clust_entry->info_bits)) {
ut_ad(clust_entry->info_bits
== (REC_INFO_MIN_REC_FLAG | REC_STATUS_COLUMNS_ADDED));
ut_ad(clust_entry->info_bits == REC_INFO_DEFAULT_ROW);
ut_ad(index->is_instant());
ut_ad(undo_page[first_free + 2] == TRX_UNDO_INSERT_REC);
undo_page[first_free + 2] = TRX_UNDO_INSERT_DEFAULT;
......@@ -1900,8 +1899,7 @@ trx_undo_report_row_operation(
ut_ad(!trx->read_only);
ut_ad(trx->id);
if (UNIV_LIKELY(!clust_entry || clust_entry->info_bits
!= (REC_INFO_MIN_REC_FLAG
| REC_STATUS_COLUMNS_ADDED))) {
!= REC_INFO_DEFAULT_ROW)) {
/* Keep INFORMATION_SCHEMA.TABLES.UPDATE_TIME
up-to-date for persistent tables outside
instant ADD COLUMN. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment