diff options
author | heikki@hundin.mysql.fi <> | 2004-06-17 00:21:41 +0300 |
---|---|---|
committer | heikki@hundin.mysql.fi <> | 2004-06-17 00:21:41 +0300 |
commit | 79fd0c68d3c0007b4ac1443cd24d981c0bd8a7ff (patch) | |
tree | 9a848012b418c3216bb1441a852a0009105a27c6 /innobase/fil | |
parent | 834e9f870e2a2fe3e9944255e66a2656f5e4bfb7 (diff) | |
download | mariadb-git-79fd0c68d3c0007b4ac1443cd24d981c0bd8a7ff.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
Diffstat (limited to 'innobase/fil')
-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); |