diff options
| author | monty@mysql.com/nosik.monty.fi <> | 2007-08-01 22:59:05 +0300 |
|---|---|---|
| committer | monty@mysql.com/nosik.monty.fi <> | 2007-08-01 22:59:05 +0300 |
| commit | 96f90711a7fb6f6c33b56b0c6519e1f1a7226277 (patch) | |
| tree | ea014474c5b5d34f211415d0a43cbc13631ccdfc /mysys/my_init.c | |
| parent | b16289a5e05397211fd47e05ce08fe12f93ec38a (diff) | |
| download | mariadb-git-96f90711a7fb6f6c33b56b0c6519e1f1a7226277.tar.gz | |
Fixes Bug#30127: --debug-info no longer prints memory usage in mysql
Fixed compiler warnings, errors and link errors
Fixed new bug on Solaris with gethrtime()
Added --debug-check option to all mysql clients to print errors and memory leaks
Added --debug-info to all clients. This now works as --debug-check but also prints memory and cpu usage
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 8281d7ced99..127e94c958b 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -130,8 +130,9 @@ void my_end(int infoflag) */ FILE *info_file= DBUG_FILE; my_bool print_info= (info_file != stderr); - /* We do not use DBUG_ENTER here, as after cleanup DBUG is no longer - operational, so we cannot use DBUG_RETURN. + /* + We do not use DBUG_ENTER here, as after cleanup DBUG is no longer + operational, so we cannot use DBUG_RETURN. */ DBUG_PRINT("info",("Shutting down")); if (!info_file) @@ -185,7 +186,7 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC); #endif #if defined(SAFEMALLOC) - TERMINATE(stderr); /* Give statistic on screen */ + TERMINATE(stderr, 1); /* Give statistic on screen */ #elif defined(__WIN__) && defined(_MSC_VER) _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); @@ -197,6 +198,10 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", _CrtDumpMemoryLeaks(); #endif } + else if (infoflag & MY_CHECK_ERROR) + { + TERMINATE(stderr, 0); /* Print memory leaks on screen */ + } if (!(infoflag & MY_DONT_FREE_DBUG)) { |