Commit c50b5399 authored by marko's avatar marko

branches/zip: Clean up some comments.

parent d2b78203
...@@ -4256,7 +4256,7 @@ UNIV_INTERN ...@@ -4256,7 +4256,7 @@ UNIV_INTERN
void void
dict_table_print_by_name( dict_table_print_by_name(
/*=====================*/ /*=====================*/
const char* name) const char* name) /* in: table name */
{ {
dict_table_t* table; dict_table_t* table;
......
...@@ -380,7 +380,6 @@ static ...@@ -380,7 +380,6 @@ static
void void
innobase_drop_database( innobase_drop_database(
/*===================*/ /*===================*/
/* out: error number */
handlerton* hton, /* in: handlerton of Innodb */ handlerton* hton, /* in: handlerton of Innodb */
char* path); /* in: database path; inside InnoDB the name char* path); /* in: database path; inside InnoDB the name
of the last directory in the path is used as of the last directory in the path is used as
...@@ -2755,6 +2754,8 @@ Get the table flags to use for the statement. */ ...@@ -2755,6 +2754,8 @@ Get the table flags to use for the statement. */
UNIV_INTERN UNIV_INTERN
handler::Table_flags handler::Table_flags
ha_innobase::table_flags() const ha_innobase::table_flags() const
/*============================*/
/* out: table flags */
{ {
/* Need to use tx_isolation here since table flags is (also) /* Need to use tx_isolation here since table flags is (also)
called before prebuilt is inited. */ called before prebuilt is inited. */
...@@ -2899,6 +2900,7 @@ UNIV_INTERN ...@@ -2899,6 +2900,7 @@ UNIV_INTERN
ulint ulint
ha_innobase::innobase_initialize_autoinc() ha_innobase::innobase_initialize_autoinc()
/*======================================*/ /*======================================*/
/* out: DB_SUCCESS or error code */
{ {
dict_index_t* index; dict_index_t* index;
ulonglong auto_inc; ulonglong auto_inc;
...@@ -4765,6 +4767,7 @@ UNIV_INTERN ...@@ -4765,6 +4767,7 @@ UNIV_INTERN
int int
ha_innobase::index_end(void) ha_innobase::index_end(void)
/*========================*/ /*========================*/
/* out: 0 */
{ {
int error = 0; int error = 0;
DBUG_ENTER("index_end"); DBUG_ENTER("index_end");
...@@ -6442,7 +6445,6 @@ static ...@@ -6442,7 +6445,6 @@ static
void void
innobase_drop_database( innobase_drop_database(
/*===================*/ /*===================*/
/* out: error number */
handlerton *hton, /* in: handlerton of Innodb */ handlerton *hton, /* in: handlerton of Innodb */
char* path) /* in: database path; inside InnoDB the name char* path) /* in: database path; inside InnoDB the name
of the last directory in the path is used as of the last directory in the path is used as
...@@ -7447,6 +7449,7 @@ UNIV_INTERN ...@@ -7447,6 +7449,7 @@ UNIV_INTERN
bool bool
ha_innobase::can_switch_engines(void) ha_innobase::can_switch_engines(void)
/*=================================*/ /*=================================*/
/* out: TRUE if can switch engines */
{ {
bool can_switch; bool can_switch;
...@@ -7945,9 +7948,9 @@ ha_innobase::transactional_table_lock( ...@@ -7945,9 +7948,9 @@ ha_innobase::transactional_table_lock(
/**************************************************************************** /****************************************************************************
Here we export InnoDB status variables to MySQL. */ Here we export InnoDB status variables to MySQL. */
static static
int void
innodb_export_status() innodb_export_status(void)
/*==================*/ /*======================*/
{ {
if (innodb_inited) { if (innodb_inited) {
srv_export_innodb_status(); srv_export_innodb_status();
......
...@@ -90,14 +90,19 @@ absolute address (VA). This is due to the pointers in the delay ...@@ -90,14 +90,19 @@ absolute address (VA). This is due to the pointers in the delay
descriptor (ImgDelayDescr in delayimp.h) have been changed from descriptor (ImgDelayDescr in delayimp.h) have been changed from
VAs to RVAs to work on both 32- and 64-bit platforms. */ VAs to RVAs to work on both 32- and 64-bit platforms. */
template <class X> template <class X>
X PFromRva(RVA rva) { X PFromRva(
/*=======*/
/* out: absolute virtual address */
RVA rva) /* in: relative virtual address */
{
return X(PBYTE(&__ImageBase) + rva); return X(PBYTE(&__ImageBase) + rva);
} }
/*********************************************************************** /***********************************************************************
Convert to the old format for convenience. The structure as well as its Convert to the old format for convenience. The structure as well as its
element names follow the definition of ImgDelayDescr in delayimp.h. */ element names follow the definition of ImgDelayDescr in delayimp.h. */
struct InternalImgDelayDescr { struct InternalImgDelayDescr
{
DWORD grAttrs; /* attributes */ DWORD grAttrs; /* attributes */
LPCSTR szName; /* pointer to dll name */ LPCSTR szName; /* pointer to dll name */
HMODULE* phmod; /* address of module handle */ HMODULE* phmod; /* address of module handle */
...@@ -138,8 +143,7 @@ in the server: ...@@ -138,8 +143,7 @@ in the server:
_db_return_ _db_return_
_db_dump_ _db_dump_
The plugin will get those function pointers during the initialization. The plugin will get those function pointers during the initialization. */
*/
typedef void (__cdecl* pfn_db_enter_)( typedef void (__cdecl* pfn_db_enter_)(
const char* _func_, const char* _func_,
const char* _file_, const char* _file_,
......
...@@ -484,7 +484,7 @@ UNIV_INTERN ...@@ -484,7 +484,7 @@ UNIV_INTERN
void void
dict_table_print_by_name( dict_table_print_by_name(
/*=====================*/ /*=====================*/
const char* name); const char* name); /* in: table name */
/************************************************************************** /**************************************************************************
Outputs info on foreign keys of a table. */ Outputs info on foreign keys of a table. */
UNIV_INTERN UNIV_INTERN
......
...@@ -250,8 +250,7 @@ mem_free_func( ...@@ -250,8 +250,7 @@ mem_free_func(
/*==========*/ /*==========*/
void* ptr, /* in, own: buffer to be freed */ void* ptr, /* in, own: buffer to be freed */
const char* file_name, /* in: file name where created */ const char* file_name, /* in: file name where created */
ulint line /* in: line where created */ ulint line); /* in: line where created */
);
/************************************************************************** /**************************************************************************
Duplicates a NUL-terminated string. */ Duplicates a NUL-terminated string. */
......
...@@ -565,8 +565,7 @@ mem_free_func( ...@@ -565,8 +565,7 @@ mem_free_func(
/*==========*/ /*==========*/
void* ptr, /* in, own: buffer to be freed */ void* ptr, /* in, own: buffer to be freed */
const char* file_name, /* in: file name where created */ const char* file_name, /* in: file name where created */
ulint line /* in: line where created */ ulint line) /* in: line where created */
)
{ {
mem_heap_t* heap; mem_heap_t* heap;
......
...@@ -939,7 +939,7 @@ UNIV_INTERN ...@@ -939,7 +939,7 @@ UNIV_INTERN
void void
page_header_print( page_header_print(
/*==============*/ /*==============*/
const page_t* page); const page_t* page); /* in: index page */
/******************************************************************* /*******************************************************************
This is used to print the contents of the page for This is used to print the contents of the page for
debugging purposes. */ debugging purposes. */
......
...@@ -410,7 +410,7 @@ struct que_fork_struct{ ...@@ -410,7 +410,7 @@ struct que_fork_struct{
sym_tab_t* sym_tab; /* symbol table of the query, sym_tab_t* sym_tab; /* symbol table of the query,
generated by the parser, or NULL generated by the parser, or NULL
if the graph was created 'by hand' */ if the graph was created 'by hand' */
pars_info_t* info; /* in: info struct, or NULL */ pars_info_t* info; /* info struct, or NULL */
/* The following cur_... fields are relevant only in a select graph */ /* The following cur_... fields are relevant only in a select graph */
ulint cur_end; /* QUE_CUR_NOT_DEFINED, QUE_CUR_START, ulint cur_end; /* QUE_CUR_NOT_DEFINED, QUE_CUR_START,
......
...@@ -518,7 +518,7 @@ Function to pass InnoDB status variables to MySQL */ ...@@ -518,7 +518,7 @@ Function to pass InnoDB status variables to MySQL */
UNIV_INTERN UNIV_INTERN
void void
srv_export_innodb_status(void); srv_export_innodb_status(void);
/*=====================*/ /*==========================*/
/* Thread slot in the thread table */ /* Thread slot in the thread table */
typedef struct srv_slot_struct srv_slot_t; typedef struct srv_slot_struct srv_slot_t;
......
...@@ -1767,6 +1767,7 @@ Function to pass InnoDB status variables to MySQL */ ...@@ -1767,6 +1767,7 @@ Function to pass InnoDB status variables to MySQL */
UNIV_INTERN UNIV_INTERN
void void
srv_export_innodb_status(void) srv_export_innodb_status(void)
/*==========================*/
{ {
mutex_enter(&srv_innodb_monitor_mutex); mutex_enter(&srv_innodb_monitor_mutex);
......
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