diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:39:45 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:39:45 +0300 |
| commit | dd2836c4c153566420efcdbe68173b29adcb24e5 (patch) | |
| tree | 0be61ddbb8a76073cf672a53d8a43bbb00c751eb /sql/sql_parse.cc | |
| parent | 2a450f0c1e4e670f91875683b7761648496d9c63 (diff) | |
| download | mariadb-git-dd2836c4c153566420efcdbe68173b29adcb24e5.tar.gz | |
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_
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7447ba44e76..3e72bf1d919 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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)); |