Commit ae70562a authored by marko's avatar marko

branches/zip: Adjust some function comments after r5091.

parent 8ab5601e
...@@ -41,16 +41,16 @@ Created 4/24/1996 Heikki Tuuri ...@@ -41,16 +41,16 @@ Created 4/24/1996 Heikki Tuuri
#include "srv0srv.h" #include "srv0srv.h"
/******************************************************************** /********************************************************************
Returns TRUE if index's i'th column's name is 'name' . Compare the name of an index column.
@return */ @return TRUE if the i'th column of index is 'name'. */
static static
ibool ibool
name_of_col_is( name_of_col_is(
/*===========*/ /*===========*/
dict_table_t* table, /*!< in: table */ const dict_table_t* table, /*!< in: table */
dict_index_t* index, /*!< in: index */ const dict_index_t* index, /*!< in: index */
ulint i, /*!< in: */ ulint i, /*!< in: index field offset */
const char* name) /*!< in: name to compare to */ const char* name) /*!< in: name to compare to */
{ {
ulint tmp = dict_col_get_no(dict_field_get_col( ulint tmp = dict_col_get_no(dict_field_get_col(
dict_index_get_nth_field( dict_index_get_nth_field(
......
...@@ -294,27 +294,29 @@ static handler *innobase_create_handler(handlerton *hton, ...@@ -294,27 +294,29 @@ static handler *innobase_create_handler(handlerton *hton,
} }
/*********************************************************************** /***********************************************************************
This function is used to prepare X/Open XA distributed transaction This function is used to prepare an X/Open XA distributed transaction.
@return 0 or error number */ @return 0 or error number */
static static
int int
innobase_xa_prepare( innobase_xa_prepare(
/*================*/ /*================*/
handlerton* hton, handlerton* hton, /*!< in: InnoDB handlerton */
THD* thd, /*!< in: handle to the MySQL thread of the user THD* thd, /*!< in: handle to the MySQL thread of
whose XA transaction should be prepared */ the user whose XA transaction should
bool all); /*!< in: TRUE - commit transaction be prepared */
FALSE - the current SQL statement ended */ bool all); /*!< in: TRUE - commit transaction
FALSE - the current SQL statement
ended */
/*********************************************************************** /***********************************************************************
This function is used to recover X/Open XA distributed transactions This function is used to recover X/Open XA distributed transactions.
@return number of prepared transactions stored in xid_list */ @return number of prepared transactions stored in xid_list */
static static
int int
innobase_xa_recover( innobase_xa_recover(
/*================*/ /*================*/
handlerton* hton, handlerton* hton, /*!< in: InnoDB handlerton */
XID* xid_list, /*!< in/out: prepared transactions */ XID* xid_list,/*!< in/out: prepared transactions */
uint len); /*!< in: number of slots in xid_list */ uint len); /*!< in: number of slots in xid_list */
/*********************************************************************** /***********************************************************************
This function is used to commit one X/Open XA distributed transaction This function is used to commit one X/Open XA distributed transaction
which is in the prepared state which is in the prepared state
...@@ -4128,7 +4130,7 @@ ha_innobase::innobase_reset_autoinc( ...@@ -4128,7 +4130,7 @@ ha_innobase::innobase_reset_autoinc(
/************************************************************************ /************************************************************************
Store the autoinc value in the table. The autoinc value is only set if Store the autoinc value in the table. The autoinc value is only set if
it's greater than the existing autoinc value in the table. it's greater than the existing autoinc value in the table.
@return DB_SUCCES if all went well else error code */ @return DB_SUCCESS if all went well else error code */
UNIV_INTERN UNIV_INTERN
ulint ulint
ha_innobase::innobase_set_max_autoinc( ha_innobase::innobase_set_max_autoinc(
...@@ -8876,17 +8878,19 @@ innobase_get_at_most_n_mbchars( ...@@ -8876,17 +8878,19 @@ innobase_get_at_most_n_mbchars(
} }
/*********************************************************************** /***********************************************************************
This function is used to prepare X/Open XA distributed transaction This function is used to prepare an X/Open XA distributed transaction.
@return 0 or error number */ @return 0 or error number */
static static
int int
innobase_xa_prepare( innobase_xa_prepare(
/*================*/ /*================*/
handlerton *hton, handlerton* hton, /*!< in: InnoDB handlerton */
THD* thd, /*!< in: handle to the MySQL thread of the user THD* thd, /*!< in: handle to the MySQL thread of
whose XA transaction should be prepared */ the user whose XA transaction should
bool all) /*!< in: TRUE - commit transaction be prepared */
FALSE - the current SQL statement ended */ bool all) /*!< in: TRUE - commit transaction
FALSE - the current SQL statement
ended */
{ {
int error = 0; int error = 0;
trx_t* trx = check_trx_exists(thd); trx_t* trx = check_trx_exists(thd);
...@@ -8976,15 +8980,15 @@ innobase_xa_prepare( ...@@ -8976,15 +8980,15 @@ innobase_xa_prepare(
} }
/*********************************************************************** /***********************************************************************
This function is used to recover X/Open XA distributed transactions This function is used to recover X/Open XA distributed transactions.
@return number of prepared transactions stored in xid_list */ @return number of prepared transactions stored in xid_list */
static static
int int
innobase_xa_recover( innobase_xa_recover(
/*================*/ /*================*/
handlerton *hton, handlerton* hton, /*!< in: InnoDB handlerton */
XID* xid_list, /*!< in/out: prepared transactions */ XID* xid_list,/*!< in/out: prepared transactions */
uint len) /*!< in: number of slots in xid_list */ uint len) /*!< in: number of slots in xid_list */
{ {
DBUG_ASSERT(hton == innodb_hton_ptr); DBUG_ASSERT(hton == innodb_hton_ptr);
......
...@@ -73,7 +73,7 @@ ulong* wdl_specialflag; ...@@ -73,7 +73,7 @@ ulong* wdl_specialflag;
int* wdl_my_umask; int* wdl_my_umask;
/*********************************************************************** /***********************************************************************
The preffered load-address defined in PE (portable executable format). */ The preferred load-address defined in PE (portable executable format). */
#if defined(_M_IA64) #if defined(_M_IA64)
#pragma section(".base", long, read) #pragma section(".base", long, read)
extern "C" extern "C"
......
...@@ -1142,7 +1142,7 @@ ibuf_dummy_index_add_col( ...@@ -1142,7 +1142,7 @@ ibuf_dummy_index_add_col(
} }
/************************************************************************ /************************************************************************
Deallocates a dummy index for inserting a record to a non-clustered index. Deallocates a dummy index for inserting a record to a non-clustered index.
*/ */
static static
void void
ibuf_dummy_index_free( ibuf_dummy_index_free(
......
...@@ -1447,7 +1447,7 @@ FILE_PAGE => NOT_USED NOTE: This transition is allowed if and only if ...@@ -1447,7 +1447,7 @@ FILE_PAGE => NOT_USED NOTE: This transition is allowed if and only if
(1) buf_fix_count == 0, (1) buf_fix_count == 0,
(2) oldest_modification == 0, and (2) oldest_modification == 0, and
(3) io_fix == 0. (3) io_fix == 0.
*/ */
#ifndef UNIV_NONINL #ifndef UNIV_NONINL
#include "buf0buf.ic" #include "buf0buf.ic"
......
...@@ -105,13 +105,12 @@ ha_storage_empty( ...@@ -105,13 +105,12 @@ ha_storage_empty(
/*********************************************************************** /***********************************************************************
Frees a hash storage and everything it contains, it cannot be used after Frees a hash storage and everything it contains, it cannot be used after
this call. this call.
This invalidates any pointers previously returned by ha_storage_put(). This invalidates any pointers previously returned by ha_storage_put(). */
*/
UNIV_INLINE UNIV_INLINE
void void
ha_storage_free( ha_storage_free(
/*============*/ /*============*/
ha_storage_t* storage); /*!< in/out: hash storage */ ha_storage_t* storage); /*!< in, own: hash storage */
/*********************************************************************** /***********************************************************************
Gets the size of the memory used by a storage. Gets the size of the memory used by a storage.
......
...@@ -111,13 +111,12 @@ ha_storage_empty( ...@@ -111,13 +111,12 @@ ha_storage_empty(
/*********************************************************************** /***********************************************************************
Frees a hash storage and everything it contains, it cannot be used after Frees a hash storage and everything it contains, it cannot be used after
this call. this call.
This invalidates any pointers previously returned by ha_storage_put(). This invalidates any pointers previously returned by ha_storage_put(). */
*/
UNIV_INLINE UNIV_INLINE
void void
ha_storage_free( ha_storage_free(
/*============*/ /*============*/
ha_storage_t* storage) /*!< in/out: hash storage */ ha_storage_t* storage) /*!< in, own: hash storage */
{ {
/* order is important because the pointer storage->hash is /* order is important because the pointer storage->hash is
within the heap */ within the heap */
......
...@@ -62,7 +62,7 @@ void ...@@ -62,7 +62,7 @@ void
mem_erase_buf( mem_erase_buf(
/*==========*/ /*==========*/
byte* buf, /*!< in: pointer to buffer */ byte* buf, /*!< in: pointer to buffer */
ulint n); /*!< in: length of buffer */ ulint n); /*!< in: length of buffer */
/******************************************************************* /*******************************************************************
Inserts a created memory heap to the hash table of Inserts a created memory heap to the hash table of
current allocated memory heaps. current allocated memory heaps.
......
...@@ -470,7 +470,7 @@ UNIV_INTERN ...@@ -470,7 +470,7 @@ UNIV_INTERN
void void
pars_info_free( pars_info_free(
/*===========*/ /*===========*/
pars_info_t* info); /*!< in: info struct */ pars_info_t* info); /*!< in, own: info struct */
/******************************************************************** /********************************************************************
Add bound literal. */ Add bound literal. */
......
...@@ -398,8 +398,8 @@ trx_is_interrupted( ...@@ -398,8 +398,8 @@ trx_is_interrupted(
/*********************************************************************** /***********************************************************************
Calculates the "weight" of a transaction. The weight of one transaction Calculates the "weight" of a transaction. The weight of one transaction
is estimated as the number of altered rows + the number of locked rows. is estimated as the number of altered rows + the number of locked rows.
*/ @param t transaction
@return transaction weight */
#define TRX_WEIGHT(t) \ #define TRX_WEIGHT(t) \
ut_dulint_add((t)->undo_no, UT_LIST_GET_LEN((t)->trx_locks)) ut_dulint_add((t)->undo_no, UT_LIST_GET_LEN((t)->trx_locks))
......
...@@ -58,8 +58,7 @@ struct LRU_node_struct { ...@@ -58,8 +58,7 @@ struct LRU_node_struct {
... ...
} }
The example implements an LRU list of name LRU_list. Its nodes are of type The example implements an LRU list of name LRU_list. Its nodes are of type
LRU_node_t. LRU_node_t. */
*/
#define UT_LIST_NODE_T(TYPE)\ #define UT_LIST_NODE_T(TYPE)\
struct {\ struct {\
......
...@@ -280,7 +280,7 @@ void ...@@ -280,7 +280,7 @@ void
mem_erase_buf( mem_erase_buf(
/*==========*/ /*==========*/
byte* buf, /*!< in: pointer to buffer */ byte* buf, /*!< in: pointer to buffer */
ulint n) /*!< in: length of buffer */ ulint n) /*!< in: length of buffer */
{ {
byte* ptr; byte* ptr;
......
...@@ -747,13 +747,13 @@ Linux. ...@@ -747,13 +747,13 @@ Linux.
static ulint stringbuf_len_alloc = 0; /* Allocated length */ static ulint stringbuf_len_alloc = 0; /* Allocated length */
static ulint stringbuf_len = 0; /* Current length */ static ulint stringbuf_len = 0; /* Current length */
static char* stringbuf; /* Start of buffer */ static char* stringbuf; /* Start of buffer */
/* Appends a string to the buffer. */ /** Appends a string to the buffer. */
static static
void void
string_append( string_append(
/*==========*/ /*==========*/
const char* str, /* in: string to be appended */ const char* str, /*!< in: string to be appended */
ulint len) /* in: length of the string */ ulint len) /*!< in: length of the string */
{ {
if (stringbuf == NULL) { if (stringbuf == NULL) {
stringbuf = malloc(1); stringbuf = malloc(1);
......
...@@ -70,13 +70,13 @@ Created 12/14/1997 Heikki Tuuri ...@@ -70,13 +70,13 @@ Created 12/14/1997 Heikki Tuuri
static ulint stringbuf_len_alloc = 0; /* Allocated length */ static ulint stringbuf_len_alloc = 0; /* Allocated length */
static ulint stringbuf_len = 0; /* Current length */ static ulint stringbuf_len = 0; /* Current length */
static char* stringbuf; /* Start of buffer */ static char* stringbuf; /* Start of buffer */
/* Appends a string to the buffer. */ /** Appends a string to the buffer. */
static static
void void
string_append( string_append(
/*==========*/ /*==========*/
const char* str, /* in: string to be appended */ const char* str, /*!< in: string to be appended */
ulint len) /* in: length of the string */ ulint len) /*!< in: length of the string */
{ {
if (stringbuf == NULL) { if (stringbuf == NULL) {
stringbuf = malloc(1); stringbuf = malloc(1);
......
...@@ -1952,7 +1952,7 @@ UNIV_INTERN ...@@ -1952,7 +1952,7 @@ UNIV_INTERN
void void
pars_info_free( pars_info_free(
/*===========*/ /*===========*/
pars_info_t* info) /*!< in: info struct */ pars_info_t* info) /*!< in, own: info struct */
{ {
mem_heap_free(info->heap); mem_heap_free(info->heap);
} }
......
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