diff options
Diffstat (limited to 'innobase')
-rw-r--r-- | innobase/data/data0type.c | 1 | ||||
-rw-r--r-- | innobase/fil/fil0fil.c | 3 | ||||
-rw-r--r-- | innobase/log/log0recv.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/innobase/data/data0type.c b/innobase/data/data0type.c index 1e08bb41c36..97d93b1b0ec 100644 --- a/innobase/data/data0type.c +++ b/innobase/data/data0type.c @@ -104,7 +104,6 @@ dtype_form_prtype( return(old_prtype + (charset_coll << 16)); } -#ifdef UNIV_DEBUG /************************************************************************* Validates a data type structure. */ diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index a200116797a..6a13c1de6e3 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -2825,8 +2825,7 @@ fil_load_single_table_tablespaces(void) if (!dbpath) { dbpath = mem_alloc(dbpath_len); } else { - dbpath = mem_realloc(dbpath, dbpath_len, - __FILE__, __LINE__); + dbpath = ut_realloc(dbpath, dbpath_len); } } sprintf(dbpath, "%s/%s", fil_path_to_mysql_datadir, diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c index a1e9ae8c288..7e57efcf9e1 100644 --- a/innobase/log/log0recv.c +++ b/innobase/log/log0recv.c @@ -1513,7 +1513,6 @@ skip_this_recv_addr: recv_sys_empty_hash(); } -#endif /* UNIV_HOTBACKUP */ #ifdef notdefined /*********************************************************************** |