File tree Expand file tree Collapse file tree 6 files changed +14
-14
lines changed Expand file tree Collapse file tree 6 files changed +14
-14
lines changed Original file line number Diff line number Diff line change @@ -1443,6 +1443,9 @@ struct buf_page_t{
1443
1443
by buf_pool->mutex. */
1444
1444
ib_uint32_t offset ; /*!< page number; also protected
1445
1445
by buf_pool->mutex. */
1446
+ buf_page_t * hash ; /*!< node used in chaining to
1447
+ buf_pool->page_hash or
1448
+ buf_pool->zip_hash */
1446
1449
/** count of how manyfold this block is currently bufferfixed */
1447
1450
#ifdef PAGE_ATOMIC_REF_COUNT
1448
1451
ib_uint32_t buf_fix_count ;
@@ -1489,9 +1492,6 @@ struct buf_page_t{
1489
1492
zip.data == NULL means an active
1490
1493
buf_pool->watch */
1491
1494
#ifndef UNIV_HOTBACKUP
1492
- buf_page_t * hash ; /*!< node used in chaining to
1493
- buf_pool->page_hash or
1494
- buf_pool->zip_hash */
1495
1495
#ifdef UNIV_DEBUG
1496
1496
ibool in_page_hash ; /*!< TRUE if in buf_pool->page_hash */
1497
1497
ibool in_zip_hash ; /*!< TRUE if in buf_pool->zip_hash */
Original file line number Diff line number Diff line change @@ -926,8 +926,10 @@ struct dict_table_t{
926
926
927
927
928
928
table_id_t id; /* !< id of the table */
929
+ hash_node_t id_hash; /* !< hash chain node */
929
930
mem_heap_t * heap; /* !< memory heap */
930
931
char * name; /* !< table name */
932
+ hash_node_t name_hash; /* !< hash chain node */
931
933
const char * dir_path_of_temp_table;/* !< NULL or the directory path
932
934
where a TEMPORARY table that was explicitly
933
935
created by a user should be placed if
@@ -983,8 +985,6 @@ struct dict_table_t{
983
985
dictionary information and
984
986
MySQL FRM information mismatch. */
985
987
#ifndef UNIV_HOTBACKUP
986
- hash_node_t name_hash; /* !< hash chain node */
987
- hash_node_t id_hash; /* !< hash chain node */
988
988
UT_LIST_BASE_NODE_T (dict_index_t )
989
989
indexes; /* !< list of indexes of the table */
990
990
Original file line number Diff line number Diff line change @@ -245,7 +245,9 @@ struct fil_node_t {
245
245
struct fil_space_t {
246
246
char * name; /* !< space name = the path to the first file in
247
247
it */
248
+ hash_node_t name_hash;/* !< hash chain the name_hash table */
248
249
ulint id; /* !< space id */
250
+ hash_node_t hash; /* !< hash chain node */
249
251
ib_int64_t tablespace_version;
250
252
/* !< in DISCARD/IMPORT this timestamp
251
253
is used to check if we should ignore
@@ -292,8 +294,6 @@ struct fil_space_t {
292
294
trying to read a block.
293
295
Dropping of the tablespace is forbidden
294
296
if this is positive */
295
- hash_node_t hash; /* !< hash chain node */
296
- hash_node_t name_hash;/* !< hash chain the name_hash table */
297
297
#ifndef UNIV_HOTBACKUP
298
298
rw_lock_t latch; /* !< latch protecting the file space storage
299
299
allocation */
Original file line number Diff line number Diff line change @@ -1477,6 +1477,9 @@ struct buf_page_t{
1477
1477
1478
1478
ib_uint32_t space ; /*!< tablespace id. */
1479
1479
ib_uint32_t offset ; /*!< page number. */
1480
+ buf_page_t * hash ; /*!< node used in chaining to
1481
+ buf_pool->page_hash or
1482
+ buf_pool->zip_hash */
1480
1483
/** count of how manyfold this block is currently bufferfixed */
1481
1484
#ifdef PAGE_ATOMIC_REF_COUNT
1482
1485
ib_uint32_t buf_fix_count ;
@@ -1530,9 +1533,6 @@ struct buf_page_t{
1530
1533
zip.data == NULL means an active
1531
1534
buf_pool->watch */
1532
1535
#ifndef UNIV_HOTBACKUP
1533
- buf_page_t * hash ; /*!< node used in chaining to
1534
- buf_pool->page_hash or
1535
- buf_pool->zip_hash */
1536
1536
#ifdef UNIV_DEBUG
1537
1537
ibool in_page_hash ; /*!< TRUE if in buf_pool->page_hash */
1538
1538
ibool in_zip_hash ; /*!< TRUE if in buf_pool->zip_hash */
Original file line number Diff line number Diff line change @@ -937,8 +937,10 @@ struct dict_table_t{
937
937
938
938
939
939
table_id_t id; /* !< id of the table */
940
+ hash_node_t id_hash; /* !< hash chain node */
940
941
mem_heap_t * heap; /* !< memory heap */
941
942
char * name; /* !< table name */
943
+ hash_node_t name_hash; /* !< hash chain node */
942
944
const char * dir_path_of_temp_table;/* !< NULL or the directory path
943
945
where a TEMPORARY table that was explicitly
944
946
created by a user should be placed if
@@ -994,8 +996,6 @@ struct dict_table_t{
994
996
dictionary information and
995
997
MySQL FRM information mismatch. */
996
998
#ifndef UNIV_HOTBACKUP
997
- hash_node_t name_hash; /* !< hash chain node */
998
- hash_node_t id_hash; /* !< hash chain node */
999
999
UT_LIST_BASE_NODE_T (dict_index_t )
1000
1000
indexes; /* !< list of indexes of the table */
1001
1001
Original file line number Diff line number Diff line change @@ -238,7 +238,9 @@ struct fil_node_t {
238
238
struct fil_space_t {
239
239
char * name; /* !< space name = the path to the first file in
240
240
it */
241
+ hash_node_t name_hash;/* !< hash chain the name_hash table */
241
242
ulint id; /* !< space id */
243
+ hash_node_t hash; /* !< hash chain node */
242
244
ib_int64_t tablespace_version;
243
245
/* !< in DISCARD/IMPORT this timestamp
244
246
is used to check if we should ignore
@@ -285,8 +287,6 @@ struct fil_space_t {
285
287
trying to read a block.
286
288
Dropping of the tablespace is forbidden
287
289
if this is positive */
288
- hash_node_t hash; /* !< hash chain node */
289
- hash_node_t name_hash;/* !< hash chain the name_hash table */
290
290
#ifndef UNIV_HOTBACKUP
291
291
prio_rw_lock_t latch; /* !< latch protecting the file space storage
292
292
allocation */
You can’t perform that action at this time.
0 commit comments