diff options
Diffstat (limited to 'storage/innobase/include/mem0mem.h')
| -rw-r--r-- | storage/innobase/include/mem0mem.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h index 991d1179098..c44b6d38b78 100644 --- a/storage/innobase/include/mem0mem.h +++ b/storage/innobase/include/mem0mem.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -121,7 +122,7 @@ mem_heap_create_func( ulint size, #ifdef UNIV_DEBUG const char* file_name, - ulint line, + unsigned line, #endif /* UNIV_DEBUG */ ulint type); @@ -371,7 +372,7 @@ struct mem_block_info_t { ulint magic_n;/* magic number for debugging */ #ifdef UNIV_DEBUG char file_name[8];/* file name where the mem heap was created */ - ulint line; /*!< line number where the mem heap was created */ + unsigned line; /*!< line number where the mem heap was created */ #endif /* UNIV_DEBUG */ UT_LIST_BASE_NODE_T(mem_block_t) base; /* In the first block in the the list this is the base node of the list of blocks; |