summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-02-28 12:18:39 +0200
committermonty@mysql.com <>2005-02-28 12:18:39 +0200
commit3839e443a4fc031c183434558bc0588639707b36 (patch)
treef466a4f954ca82d8aae5e4d3ab0a985e7fdce2f7 /mysys
parent21ca91aac6ed60571e9ccfe3af02c6bc32acd1f7 (diff)
parentab11370de686d656f34cedab2b06f35b3e84a315 (diff)
downloadmariadb-git-3839e443a4fc031c183434558bc0588639707b36.tar.gz
merge with 4.1
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_init.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c
index c32fcfe6a09..bee485c3bed 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -145,6 +145,10 @@ void my_end(int infoflag)
{
#ifdef HAVE_GETRUSAGE
struct rusage rus;
+#ifdef HAVE_purify
+ /* Purify assumes that rus is uninitialized after getrusage call */
+ bzero((char*) &rus, sizeof(rus));
+#endif
if (!getrusage(RUSAGE_SELF, &rus))
fprintf(info_file,"\n\
User time %.2f, System time %.2f\n\