diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:40:08 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-06-12 22:40:08 +0300 |
| commit | f5fba553259def57df9716d968600fd4f8ae31f9 (patch) | |
| tree | da11dc181fe02d5ebbe7d564d407a5faa69f927c /sql | |
| parent | 58fb175f24f6af97acb0be6e667d4dd418f88efd (diff) | |
| parent | dd2836c4c153566420efcdbe68173b29adcb24e5 (diff) | |
| download | mariadb-git-f5fba553259def57df9716d968600fd4f8ae31f9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ca98ab96710..0f3500248c0 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4292,7 +4292,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case OPT_SAFEMALLOC_MEM_LIMIT: #if !defined(DBUG_OFF) && defined(SAFEMALLOC) - safemalloc_mem_limit = atoi(argument); + sf_malloc_mem_limit = atoi(argument); #endif break; #ifdef EMBEDDED_LIBRARY diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 9524c832856..3a8895ab120 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)); |