diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-24 00:36:48 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-24 00:36:48 +0300 |
| commit | 051859aaab7122ea8d012de2f269b67382646589 (patch) | |
| tree | 1e2dbf50b719f8c4181b1e860c5432f9186545f0 /sql/mysqld.cc | |
| parent | 4c1bdeaf928b1274d40df91072e85a35344184c0 (diff) | |
| parent | 7032486889f42b3f18b4a0a5be6cb97b74790ea8 (diff) | |
| download | mariadb-git-051859aaab7122ea8d012de2f269b67382646589.tar.gz | |
merge
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_list.h:
Auto merged
support-files/my-huge.cnf.sh:
Added query_cache_size
support-files/my-large.cnf.sh:
Added query_cache_size
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index df83d1909cb..3910bfc880b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -42,7 +42,7 @@ #define MAIN_THD #define SIGNAL_THD -#ifdef PURIFY +#ifdef HAVE_purify #define IF_PURIFY(A,B) (A) #else #define IF_PURIFY(A,B) (B) |