diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-06-17 00:21:41 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-06-17 00:21:41 +0300 |
| commit | 1fbe91f7207e39ca9a9e322d8c1044fbc3babc9f (patch) | |
| tree | 9a848012b418c3216bb1441a852a0009105a27c6 /innobase | |
| parent | 78f975ee760894f0a4ba4d7ee600a5742c190f67 (diff) | |
| download | mariadb-git-1fbe91f7207e39ca9a9e322d8c1044fbc3babc9f.tar.gz | |
fil0fil.c:
Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
innobase/fil/fil0fil.c:
Remove the use of mem_realloc in fil0fil.c; mem_alloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/fil/fil0fil.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 8e655492aa6..59fbd6f785d 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -2820,12 +2820,11 @@ fil_load_single_table_tablespaces(void) if (len > dbpath_len) { dbpath_len = len; - if (!dbpath) { - dbpath = mem_alloc(dbpath_len); - } else { - dbpath = mem_realloc(dbpath, dbpath_len, - __FILE__, __LINE__); + if (dbpath) { + mem_free(dbpath); } + + dbpath = mem_alloc(dbpath_len); } sprintf(dbpath, "%s/%s", fil_path_to_mysql_datadir, dbinfo.name); |