diff options
| author | unknown <lars@mysql.com> | 2005-09-29 12:34:03 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-09-29 12:34:03 +0200 |
| commit | d2b5d5a403fe03190c21c0bd6c3ce0659137f9a7 (patch) | |
| tree | 430e61f49a17eb2cdd8c0f0fc334e089328e679e | |
| parent | b2f976f2c83e4a0002b5c46f93e316e65fe0d991 (diff) | |
| parent | 612b9cebb26c3585da1ddbae511fdd60436a11d9 (diff) | |
| download | mariadb-git-d2b5d5a403fe03190c21c0bd6c3ce0659137f9a7.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
| -rw-r--r-- | innobase/include/mem0mem.h | 3 | ||||
| -rw-r--r-- | innobase/include/mem0mem.ic | 3 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/innobase/include/mem0mem.h b/innobase/include/mem0mem.h index 87afdb8f91c..3768e93c03e 100644 --- a/innobase/include/mem0mem.h +++ b/innobase/include/mem0mem.h @@ -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( diff --git a/innobase/include/mem0mem.ic b/innobase/include/mem0mem.ic index 8c87c884d78..28562f7c9f8 100644 --- a/innobase/include/mem0mem.ic +++ b/innobase/include/mem0mem.ic @@ -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( diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 290ee1d7883..8abde6980cc 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -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"); |