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/buf | |
| 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/buf')
| -rw-r--r-- | innobase/buf/buf0flu.c | 1 |
1 files changed, 1 insertions, 0 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" |