mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem)
include/my_sys.h: Changed safe_malloc variables to start with sf_ mysys/default.c: Use safemalloc (as we use dynamic_arrays() that uses it inderectly anyway) mysys/my_static.c: Changed safe_malloc variables to start with sf_ mysys/my_static.h: Changed safe_malloc variables to start with sf_ Changed safemalloc structure to not have to be 8 byte aligned mysys/safemalloc.c: Changed safemalloc structure to not have to be 8 byte aligned. (portability fix) BIG code cleanup sql/mysqld.cc: Changed safe_malloc variables to start with sf_ sql/sql_parse.cc: Changed safe_malloc variables to start with sf_
This commit is contained in:
@@ -1208,9 +1208,10 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
|
||||
opened_tables,refresh_version, cached_tables(),
|
||||
uptime ? (float)thd->query_id/(float)uptime : 0);
|
||||
#ifdef SAFEMALLOC
|
||||
if (lCurMemory) // Using SAFEMALLOC
|
||||
if (sf_malloc_cur_memory) // Using SAFEMALLOC
|
||||
sprintf(strend(buff), " Memory in use: %ldK Max memory used: %ldK",
|
||||
(lCurMemory+1023L)/1024L,(lMaxMemory+1023L)/1024L);
|
||||
(sf_malloc_cur_memory+1023L)/1024L,
|
||||
(sf_malloc_max_memory+1023L)/1024L);
|
||||
#endif
|
||||
VOID(my_net_write(net, buff,(uint) strlen(buff)));
|
||||
VOID(net_flush(net));
|
||||
|
Reference in New Issue
Block a user