1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed const declarations to get rid of compiler warnings. The changes are similar to what is done in innobase in MySQL 5.5

Browse Source
This commit is contained in:
Michael Widenius 2012-02-24 12:34:47 +02:00
parent 6e1dac8f77
commit c068b831ac
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innodb_plugin/btr/btr0sea.c
View File

@ -524,7 +524,7 @@ btr_search_update_hash_ref(
{ {
dict_index_t* index; dict_index_t* index;
ulint fold; ulint fold;
const rec_t* rec; rec_t* rec;
ut_ad(cursor->flag == BTR_CUR_HASH_FAIL); ut_ad(cursor->flag == BTR_CUR_HASH_FAIL);
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG

6
storage/innodb_plugin/ha/ha0ha.c
View File

@ -106,7 +106,7 @@ ha_insert_for_fold_func(
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
buf_block_t* block, /*!< in: buffer block containing the data */ buf_block_t* block, /*!< in: buffer block containing the data */
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ #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; hash_cell_t* cell;
ha_node_t* node; ha_node_t* node;
@ -238,11 +238,11 @@ ha_search_and_update_if_found_func(
/*===============================*/ /*===============================*/
hash_table_t* table, /*!< in/out: hash table */ hash_table_t* table, /*!< in/out: hash table */
ulint fold, /*!< in: folded value of the searched data */ ulint fold, /*!< in: folded value of the searched data */
const rec_t* data, /*!< in: pointer to the data */ rec_t* data, /*!< in: pointer to the data */
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
buf_block_t* new_block,/*!< in: block containing new_data */ buf_block_t* new_block,/*!< in: block containing new_data */
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
const rec_t* new_data)/*!< in: new pointer to the data */ rec_t* new_data)/*!< in: new pointer to the data */
{ {
ha_node_t* node; ha_node_t* node;

10
storage/innodb_plugin/include/ha0ha.h
View File

@ -38,7 +38,7 @@ Looks for an element in a hash table.
@return pointer to the data of the first hash table node in chain @return pointer to the data of the first hash table node in chain
having the fold number, NULL if not found */ having the fold number, NULL if not found */
UNIV_INLINE UNIV_INLINE
const rec_t* rec_t*
ha_search_and_get_data( ha_search_and_get_data(
/*===================*/ /*===================*/
hash_table_t* table, /*!< in: hash table */ hash_table_t* table, /*!< in: hash table */
@ -52,11 +52,11 @@ ha_search_and_update_if_found_func(
/*===============================*/ /*===============================*/
hash_table_t* table, /*!< in/out: hash table */ hash_table_t* table, /*!< in/out: hash table */
ulint fold, /*!< in: folded value of the searched data */ ulint fold, /*!< in: folded value of the searched data */
const rec_t* data, /*!< in: pointer to the data */ rec_t* data, /*!< in: pointer to the data */
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
buf_block_t* new_block,/*!< in: block containing new_data */ buf_block_t* new_block,/*!< in: block containing new_data */
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
const rec_t* new_data);/*!< in: new pointer to the data */ rec_t* new_data);/*!< in: new pointer to the data */
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
/** Looks for an element when we know the pointer to the data and /** Looks for an element when we know the pointer to the data and
@ -131,7 +131,7 @@ ha_insert_for_fold_func(
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
buf_block_t* block, /*!< in: buffer block containing the data */ buf_block_t* block, /*!< in: buffer block containing the data */
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ #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 */
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
/** /**
@ -210,7 +210,7 @@ struct ha_node_struct {
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
buf_block_t* block; /*!< buffer block containing the data, or NULL */ buf_block_t* block; /*!< buffer block containing the data, or NULL */
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
const rec_t* data; /*!< pointer to the data */ rec_t* data; /*!< pointer to the data */
ulint fold; /*!< fold value for the data */ ulint fold; /*!< fold value for the data */
}; };

4
storage/innodb_plugin/include/ha0ha.ic
View File

@ -58,7 +58,7 @@ ha_node_set_data_func(
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
buf_block_t* block, /*!< in: buffer block containing the data */ buf_block_t* block, /*!< in: buffer block containing the data */
#endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */ #endif /* UNIV_AHI_DEBUG || UNIV_DEBUG */
const rec_t* data) /*!< in: pointer to the data */ rec_t* data) /*!< in: pointer to the data */
{ {
#if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG #if defined UNIV_AHI_DEBUG || defined UNIV_DEBUG
node->block = block; node->block = block;
@ -111,7 +111,7 @@ Looks for an element in a hash table.
@return pointer to the data of the first hash table node in chain @return pointer to the data of the first hash table node in chain
having the fold number, NULL if not found */ having the fold number, NULL if not found */
UNIV_INLINE UNIV_INLINE
const rec_t* rec_t*
ha_search_and_get_data( ha_search_and_get_data(
/*===================*/ /*===================*/
hash_table_t* table, /*!< in: hash table */ hash_table_t* table, /*!< in: hash table */