diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-10 17:47:05 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-10 17:47:05 +0300 |
| commit | 73e86d62dedbf29fe76cc05270e6245432206201 (patch) | |
| tree | cafcb1d0d2a42df1417e331bc30c6c6e12c78cc9 /innobase | |
| parent | c0dbd4d9811e4c2433cd651d34bd5c6af72f5593 (diff) | |
| parent | aa3c4306754c3db0c2ea3a6db0cffcb6bc1ed0f7 (diff) | |
| download | mariadb-git-73e86d62dedbf29fe76cc05270e6245432206201.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
innobase/buf/buf0flu.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
Will merge later..
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/buf/buf0flu.c | 1 | ||||
| -rw-r--r-- | innobase/include/univ.i | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/innobase/buf/buf0flu.c b/innobase/buf/buf0flu.c index 82b12103c4c..c87c92ed7e3 100644 --- a/innobase/buf/buf0flu.c +++ b/innobase/buf/buf0flu.c @@ -10,6 +10,7 @@ Created 11/11/1995 Heikki Tuuri #ifdef UNIV_NONINL #include "buf0flu.ic" +#include "trx0sys.h" #endif #include "ut0byte.h" diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 6ffbb1b8fef..f3e3b22bb3d 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -9,12 +9,10 @@ Created 1/20/1994 Heikki Tuuri #ifndef univ_i #define univ_i -#if (defined(_WIN32) || defined(_WIN64)) +#if (defined(_WIN32) || defined(_WIN64)) && !defined(MYSQL_SERVER) #define __WIN__ -#ifndef MYSQL_SERVER #include <windows.h> -#endif /* If you want to check for errors with compiler level -W4, comment out the above include of windows.h and let the following defines |