diff options
author | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
---|---|---|
committer | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
commit | 224108a19ec945ac1c3da6c5ec36b6777fd59444 (patch) | |
tree | 0c9eed2ea6f66b7a2416b6a663906a7841e33deb /mysys/my_init.c | |
parent | b94f191a776791e7a120c7e7829be4ffe8109823 (diff) | |
parent | db020fb30f56c1ec1b1e65304ad5a0830fddab34 (diff) | |
download | mariadb-git-224108a19ec945ac1c3da6c5ec36b6777fd59444.tar.gz |
Fixed problems in merge
mysql-test/r/information_schema.result:
Fixed a result file.
mysql-test/r/innodb-autoinc.result:
Fixed a result file.
mysql-test/t/connect.test:
Fixed a problem with merge, needed to close
connections and use the default
Diffstat (limited to 'mysys/my_init.c')
-rw-r--r-- | mysys/my_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 0cf5c1b7e36..a34a2d9148c 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -172,7 +172,7 @@ void my_end(int infoflag) { #ifdef HAVE_GETRUSAGE struct rusage rus; -#ifdef HAVE_purify +#ifdef HAVE_valgrind /* Purify assumes that rus is uninitialized after getrusage call */ bzero((char*) &rus, sizeof(rus)); #endif |