Commit 33a0d869 authored by Marko Mäkelä's avatar Marko Mäkelä

A non-functional change related to Bug#11830883

page_rec_write_field(): Renamed from page_rec_write_index_page_no()
and inlined.
parent 7cb397c5
...@@ -659,9 +659,9 @@ dict_create_index_tree_step( ...@@ -659,9 +659,9 @@ dict_create_index_tree_step(
/* printf("Created a new index tree in space %lu root page %lu\n", /* printf("Created a new index tree in space %lu root page %lu\n",
index->space, index->page_no); */ index->space, index->page_no); */
page_rec_write_index_page_no(btr_pcur_get_rec(&pcur), page_rec_write_field(btr_pcur_get_rec(&pcur),
DICT_SYS_INDEXES_PAGE_NO_FIELD, DICT_SYS_INDEXES_PAGE_NO_FIELD,
node->page_no, &mtr); node->page_no, &mtr);
btr_pcur_close(&pcur); btr_pcur_close(&pcur);
mtr_commit(&mtr); mtr_commit(&mtr);
...@@ -731,9 +731,8 @@ dict_drop_index_tree( ...@@ -731,9 +731,8 @@ dict_drop_index_tree(
root_page_no); */ root_page_no); */
btr_free_root(space, zip_size, root_page_no, mtr); btr_free_root(space, zip_size, root_page_no, mtr);
page_rec_write_index_page_no(rec, page_rec_write_field(rec, DICT_SYS_INDEXES_PAGE_NO_FIELD,
DICT_SYS_INDEXES_PAGE_NO_FIELD, FIL_NULL, mtr);
FIL_NULL, mtr);
} }
/*******************************************************************//** /*******************************************************************//**
...@@ -836,8 +835,8 @@ create: ...@@ -836,8 +835,8 @@ create:
in SYS_INDEXES, so that the database will not get into an in SYS_INDEXES, so that the database will not get into an
inconsistent state in case it crashes between the mtr_commit() inconsistent state in case it crashes between the mtr_commit()
below and the following mtr_commit() call. */ below and the following mtr_commit() call. */
page_rec_write_index_page_no(rec, DICT_SYS_INDEXES_PAGE_NO_FIELD, page_rec_write_field(rec, DICT_SYS_INDEXES_PAGE_NO_FIELD,
FIL_NULL, mtr); FIL_NULL, mtr);
/* We will need to commit the mini-transaction in order to avoid /* We will need to commit the mini-transaction in order to avoid
deadlocks in the btr_create() call, because otherwise we would deadlocks in the btr_create() call, because otherwise we would
......
...@@ -619,17 +619,16 @@ page_rec_find_owner_rec( ...@@ -619,17 +619,16 @@ page_rec_find_owner_rec(
/*====================*/ /*====================*/
rec_t* rec); /*!< in: the physical record */ rec_t* rec); /*!< in: the physical record */
/***********************************************************************//** /***********************************************************************//**
This is a low-level operation which is used in a database index creation Write a 32-bit field in a data dictionary record. */
to update the page number of a created B-tree to a data dictionary UNIV_INLINE
record. */
UNIV_INTERN
void void
page_rec_write_index_page_no( page_rec_write_field(
/*=========================*/ /*=================*/
rec_t* rec, /*!< in: record to update */ rec_t* rec, /*!< in/out: record to update */
ulint i, /*!< in: index of the field to update */ ulint i, /*!< in: index of the field to update */
ulint page_no,/*!< in: value to write */ ulint page_no,/*!< in: value to write */
mtr_t* mtr); /*!< in: mtr */ mtr_t* mtr) /*!< in/out: mini-transaction */
__attribute__((nonnull));
/************************************************************//** /************************************************************//**
Returns the maximum combined size of records which can be inserted on top Returns the maximum combined size of records which can be inserted on top
of record heap. of record heap.
......
...@@ -959,6 +959,27 @@ page_get_free_space_of_empty( ...@@ -959,6 +959,27 @@ page_get_free_space_of_empty(
- 2 * PAGE_DIR_SLOT_SIZE)); - 2 * PAGE_DIR_SLOT_SIZE));
} }
/***********************************************************************//**
Write a 32-bit field in a data dictionary record. */
UNIV_INLINE
void
page_rec_write_field(
/*=================*/
rec_t* rec, /*!< in/out: record to update */
ulint i, /*!< in: index of the field to update */
ulint val, /*!< in: value to write */
mtr_t* mtr) /*!< in/out: mini-transaction */
{
byte* data;
ulint len;
data = rec_get_nth_field_old(rec, i, &len);
ut_ad(len == 4);
mlog_write_ulint(data, val, MLOG_4BYTES, mtr);
}
/************************************************************//** /************************************************************//**
Each user record on a page, and also the deleted user records in the heap Each user record on a page, and also the deleted user records in the heap
takes its size plus the fraction of the dir cell size / takes its size plus the fraction of the dir cell size /
......
...@@ -1253,28 +1253,6 @@ page_move_rec_list_start( ...@@ -1253,28 +1253,6 @@ page_move_rec_list_start(
return(TRUE); return(TRUE);
} }
/***********************************************************************//**
This is a low-level operation which is used in a database index creation
to update the page number of a created B-tree to a data dictionary record. */
UNIV_INTERN
void
page_rec_write_index_page_no(
/*=========================*/
rec_t* rec, /*!< in: record to update */
ulint i, /*!< in: index of the field to update */
ulint page_no,/*!< in: value to write */
mtr_t* mtr) /*!< in: mtr */
{
byte* data;
ulint len;
data = rec_get_nth_field_old(rec, i, &len);
ut_ad(len == 4);
mlog_write_ulint(data, page_no, MLOG_4BYTES, mtr);
}
#endif /* !UNIV_HOTBACKUP */ #endif /* !UNIV_HOTBACKUP */
/**************************************************************//** /**************************************************************//**
......
...@@ -2941,7 +2941,7 @@ row_truncate_table_for_mysql( ...@@ -2941,7 +2941,7 @@ row_truncate_table_for_mysql(
rec = btr_pcur_get_rec(&pcur); rec = btr_pcur_get_rec(&pcur);
if (root_page_no != FIL_NULL) { if (root_page_no != FIL_NULL) {
page_rec_write_index_page_no( page_rec_write_field(
rec, DICT_SYS_INDEXES_PAGE_NO_FIELD, rec, DICT_SYS_INDEXES_PAGE_NO_FIELD,
root_page_no, &mtr); root_page_no, &mtr);
/* We will need to commit and restart the /* We will need to commit and restart the
......
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