diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /storage/innobase/ha | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'storage/innobase/ha')
| -rw-r--r-- | storage/innobase/ha/ha0ha.cc | 12 | ||||
| -rw-r--r-- | storage/innobase/ha/hash0hash.cc | 8 |
2 files changed, 7 insertions, 13 deletions
diff --git a/storage/innobase/ha/ha0ha.cc b/storage/innobase/ha/ha0ha.cc index b58dc486cfa..3ec778f3bec 100644 --- a/storage/innobase/ha/ha0ha.cc +++ b/storage/innobase/ha/ha0ha.cc @@ -32,9 +32,7 @@ Created 8/22/1994 Heikki Tuuri #ifdef UNIV_DEBUG # include "buf0buf.h" #endif /* UNIV_DEBUG */ -#ifndef UNIV_HOTBACKUP # include "btr0sea.h" -#endif /* !UNIV_HOTBACKUP */ #include "page0page.h" /*************************************************************//** @@ -79,7 +77,6 @@ ha_create_func( return(table); } -#ifndef UNIV_HOTBACKUP if (type == MEM_HEAP_FOR_PAGE_HASH) { /* We create a hash table protected by rw_locks for buf_pool->page_hash. */ @@ -97,7 +94,6 @@ ha_create_func( table->heaps[i] = mem_heap_create_typed(4096, type); ut_a(table->heaps[i]); } -#endif /* !UNIV_HOTBACKUP */ return(table); } @@ -120,7 +116,6 @@ ha_clear( || rw_lock_own(&btr_search_latch, RW_LOCK_EXCLUSIVE)); #endif /* UNIV_SYNC_DEBUG */ -#ifndef UNIV_HOTBACKUP /* Free the memory heaps. */ n = table->n_sync_obj; @@ -151,7 +146,6 @@ ha_clear( table->n_sync_obj = 0; table->type = HASH_TABLE_SYNC_NONE; -#endif /* !UNIV_HOTBACKUP */ /* Clear the hash table. */ n = hash_get_n_cells(table); @@ -179,7 +173,7 @@ ha_insert_for_fold_func( #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG buf_block_t* block, /*!< in: buffer block containing the data */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ - const rec_t* data) /*!< in: data, must not be NULL */ + rec_t* data) /*!< in: data, must not be NULL */ { hash_cell_t* cell; ha_node_t* node; @@ -215,7 +209,7 @@ ha_insert_for_fold_func( prev_node->block = block; #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ - prev_node->data = (rec_t*) data; + prev_node->data = data; return(TRUE); } @@ -237,7 +231,7 @@ ha_insert_for_fold_func( return(FALSE); } - ha_node_set_data(node, block, (rec_t*) data); + ha_node_set_data(node, block, data); #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG if (table->adaptive) { diff --git a/storage/innobase/ha/hash0hash.cc b/storage/innobase/ha/hash0hash.cc index 99128a676d5..174b6bcb57e 100644 --- a/storage/innobase/ha/hash0hash.cc +++ b/storage/innobase/ha/hash0hash.cc @@ -106,14 +106,14 @@ void hash_mutex_exit_all_but( /*====================*/ hash_table_t* table, /*!< in: hash table */ - mutex_t* keep_mutex) /*!< in: mutex to keep */ + ib_mutex_t* keep_mutex) /*!< in: mutex to keep */ { ulint i; ut_ad(table->type == HASH_TABLE_SYNC_MUTEX); for (i = 0; i < table->n_sync_obj; i++) { - mutex_t* mutex = table->sync_obj.mutexes + i; + ib_mutex_t* mutex = table->sync_obj.mutexes + i; if (UNIV_LIKELY(keep_mutex != mutex)) { mutex_exit(mutex); } @@ -373,8 +373,8 @@ hash_create_sync_obj_func( switch (type) { case HASH_TABLE_SYNC_MUTEX: - table->sync_obj.mutexes = static_cast<mutex_t*>( - mem_alloc(n_sync_obj * sizeof(mutex_t))); + table->sync_obj.mutexes = static_cast<ib_mutex_t*>( + mem_alloc(n_sync_obj * sizeof(ib_mutex_t))); for (i = 0; i < n_sync_obj; i++) { mutex_create(hash_table_mutex_key, |