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 /storage/innobase/srv/srv0start.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 'storage/innobase/srv/srv0start.c')
| -rw-r--r-- | storage/innobase/srv/srv0start.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index ea88039f3dd..4f261d1171b 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -104,7 +104,7 @@ static char* srv_monitor_file_name; /* Avoid warnings when using purify */ -#ifdef HAVE_purify +#ifdef HAVE_valgrind static int inno_bcmp(register const char *s1, register const char *s2, register uint len) { |