mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/mydev/mysql-5.0

Browse source 
into  mysql.com:/home/mydev/mysql-5.0-5000
This commit is contained in:
ingo@mysql.com 2005-09-29 11:56:59 +02:00
commit 3ae0c86070
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
innobase/include/mem0mem.h
View file

@ -99,8 +99,7 @@ heap freeing. */
/********************************************************************* /*********************************************************************
NOTE: Use the corresponding macros instead of this function. Creates a NOTE: Use the corresponding macros instead of this function. Creates a
memory heap which allocates memory from dynamic space. For debugging memory heap which allocates memory from dynamic space. For debugging
purposes, takes also the file name and line as argument in the debug purposes, takes also the file name and line as argument. */
version. */
UNIV_INLINE UNIV_INLINE
mem_heap_t* mem_heap_t*
mem_heap_create_func( mem_heap_create_func(

3
innobase/include/mem0mem.ic
View file

@ -371,8 +371,7 @@ mem_heap_free_top(
/********************************************************************* /*********************************************************************
NOTE: Use the corresponding macros instead of this function. Creates a NOTE: Use the corresponding macros instead of this function. Creates a
memory heap which allocates memory from dynamic space. For debugging memory heap which allocates memory from dynamic space. For debugging
purposes, takes also the file name and line as argument in the debug purposes, takes also the file name and line as argument. */
version. */
UNIV_INLINE UNIV_INLINE
mem_heap_t* mem_heap_t*
mem_heap_create_func( mem_heap_create_func(

4
sql/ha_innodb.cc
View file

@ -1191,7 +1191,7 @@ Opens an InnoDB database. */
handlerton* handlerton*
innobase_init(void) innobase_init(void)
/*===============*/ /*===============*/
/* out: TRUE if error */ /* out: &innobase_hton, or NULL on error */
{ {
static char current_dir[3]; /* Set if using current lib */ static char current_dir[3]; /* Set if using current lib */
int err; int err;
@ -2492,7 +2492,7 @@ Closes a handle to an InnoDB table. */
int int
ha_innobase::close(void) ha_innobase::close(void)
/*====================*/ /*====================*/
/* out: error number */ /* out: 0 */
{ {
DBUG_ENTER("ha_innobase::close"); DBUG_ENTER("ha_innobase::close");