Commit 05bcc7ed authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/mydev/mysql-5.0-5000
parents 34b85dc5 612b9ceb

innobase/include/mem0mem.h

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ heap freeing. */ 
/*********************************************************************

NOTE: Use the corresponding macros instead of this function. Creates a

memory heap which allocates memory from dynamic space. For debugging

purposes, takes also the file name and line as argument in the debug

version. */

purposes, takes also the file name and line as argument. */

UNIV_INLINE

mem_heap_t*

mem_heap_create_func(

innobase/include/mem0mem.ic

+1 −2
Original line number Diff line number Diff line
@@ -371,8 +371,7 @@ mem_heap_free_top( 
/*********************************************************************

NOTE: Use the corresponding macros instead of this function. Creates a

memory heap which allocates memory from dynamic space. For debugging

purposes, takes also the file name and line as argument in the debug

version. */

purposes, takes also the file name and line as argument. */

UNIV_INLINE

mem_heap_t*

mem_heap_create_func(

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ Opens an InnoDB database. */ 
handlerton*

innobase_init(void)

/*===============*/

			/* out: TRUE if error */

			/* out: &innobase_hton, or NULL on error */

{

	static char	current_dir[3];		/* Set if using current lib */

	int		err;
@@ -2492,7 +2492,7 @@ Closes a handle to an InnoDB table. */ 
int

ha_innobase::close(void)

/*====================*/

				/* out: error number */

				/* out: 0 */

{

  	DBUG_ENTER("ha_innobase::close");