diff options
| author | unknown <monty@mysql.com> | 2005-02-28 12:18:39 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-28 12:18:39 +0200 |
| commit | 45a26d449d157fb2f5c4b5ae871eb98728d9ee55 (patch) | |
| tree | f466a4f954ca82d8aae5e4d3ab0a985e7fdce2f7 /mysys | |
| parent | 108702a34e37bae22f117a3a7e18e7cead3e63c8 (diff) | |
| parent | 8e3addf9284742a6b29fb3016b8c612dfd1a5778 (diff) | |
| download | mariadb-git-45a26d449d157fb2f5c4b5ae871eb98728d9ee55.tar.gz | |
merge with 4.1
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/type_set.result:
Auto merged
mysys/default.c:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-simple.c:
Auto merged
include/mysql_com.h:
Merge
sql/filesort.cc:
merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_init.c | 4 |
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\ |