mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: Clean up fast index creation.

Browse source 
merge_rec_list_t: Define n_records only #ifdef UNIV_DEBUG.
This commit is contained in:
marko 2007-04-16 07:11:00 +00:00
parent 01a6c8c4cb
commit 573a7a4729
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
row/row0merge.c
View file

@ -75,8 +75,10 @@ struct merge_rec_list_struct {
list */ list */
merge_rec_t* tail; /* Pointer to tail of the merge_rec_t* tail; /* Pointer to tail of the
list */ list */
#ifdef UNIV_DEBUG
ulint n_records; /* Number of records in ulint n_records; /* Number of records in
the list */ the list */
#endif /* UNIV_DEBUG */
ulint total_size; /* Total size of all records in ulint total_size; /* Total size of all records in
the list */ the list */
mem_heap_t* heap; /* Heap where memory for this mem_heap_t* heap; /* Heap where memory for this
@ -734,7 +736,7 @@ row_merge_create_list(void)
list_header->head = NULL; list_header->head = NULL;
list_header->tail = NULL; list_header->tail = NULL;
list_header->n_records = 0; ut_d(list_header->n_records = 0);
list_header->total_size = sizeof(merge_rec_list_t); list_header->total_size = sizeof(merge_rec_list_t);
list_header->heap = heap; list_header->heap = heap;
@ -765,7 +767,7 @@ row_merge_list_add(
list_header->tail = m_rec; list_header->tail = m_rec;
} }
list_header->n_records++; ut_d(list_header->n_records++);
} }
/***************************************************************** /*****************************************************************
@ -809,7 +811,7 @@ row_merge_write_list_to_block(
sec_offs, output, offset); sec_offs, output, offset);
m_rec = m_rec->next; m_rec = m_rec->next;
list->n_records--; ut_d(list->n_records--);
} }
/* Now create a new list and store rest of the records there. /* Now create a new list and store rest of the records there.
@ -1616,8 +1618,12 @@ next_record:
/* While we have items in the list write them /* While we have items in the list write them
to the block */ to the block */
ut_ad(!merge_list[idx_num]->head
== !merge_list[idx_num]->tail);
ut_ad(!merge_list[idx_num]->n_records
== !merge_list[idx_num]->head);
if (merge_list[idx_num]->n_records > 0) { if (merge_list[idx_num]->head) {
/* Next block will be written directly /* Next block will be written directly
behind this one. This will create a behind this one. This will create a