diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-06-06 13:19:29 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2010-06-06 13:19:29 +0200 |
| commit | 142a162c665704ce5b4d5b671d05a068661c088a (patch) | |
| tree | def1ebab09889a8f09a9fcd074c8a672689376af /storage/innobase/include/ut0mem.h | |
| parent | cbf4019a1b3ec82bdcd9a65db114908a920fb01c (diff) | |
| parent | 60a9d9bbb94ac03159bcc2d75b649abb1c9dc956 (diff) | |
| download | mariadb-git-142a162c665704ce5b4d5b671d05a068661c088a.tar.gz | |
manual merge from mysql-trunk-bugfixing
Conflicts:
Text conflict in mysql-test/r/archive.result
Contents conflict in mysql-test/r/innodb_bug38231.result
Text conflict in mysql-test/r/mdl_sync.result
Text conflict in mysql-test/suite/binlog/t/disabled.def
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
Text conflict in mysql-test/t/archive.test
Contents conflict in mysql-test/t/innodb_bug38231.test
Text conflict in mysql-test/t/mdl_sync.test
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_show.cc
Text conflict in sql/table.cc
Text conflict in sql/table.h
Diffstat (limited to 'storage/innobase/include/ut0mem.h')
| -rw-r--r-- | storage/innobase/include/ut0mem.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h index cf41cba4643..57dfb08f41c 100644 --- a/storage/innobase/include/ut0mem.h +++ b/storage/innobase/include/ut0mem.h @@ -113,12 +113,13 @@ ut_test_malloc( ulint n); /*!< in: try to allocate this many bytes */ #endif /* !UNIV_HOTBACKUP */ /**********************************************************************//** -Frees a memory block allocated with ut_malloc. */ +Frees a memory block allocated with ut_malloc. Freeing a NULL pointer is +a nop. */ UNIV_INTERN void ut_free( /*====*/ - void* ptr); /*!< in, own: memory block */ + void* ptr); /*!< in, own: memory block, can be NULL */ #ifndef UNIV_HOTBACKUP /**********************************************************************//** Implements realloc. This is needed by /pars/lexyy.c. Otherwise, you should not |