diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /storage/maria/ha_maria.h | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'storage/maria/ha_maria.h')
| -rw-r--r-- | storage/maria/ha_maria.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 605ad1d3a20..1e540fd5e7b 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -1,3 +1,5 @@ +#ifndef HA_MARIA_INCLUDED +#define HA_MARIA_INCLUDED /* Copyright (C) 2006,2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB This program is free software; you can redistribute it and/or modify @@ -13,9 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef HA_MARIA_INCLUDED -#define HA_MARIA_INCLUDED - #ifdef USE_PRAGMA_INTERFACE #pragma interface /* gcc class implementation */ #endif @@ -23,6 +22,8 @@ /* class for the maria handler */ #include <maria.h> +#include "handler.h" +#include "table.h" #define HA_RECOVER_NONE 0 /* No automatic recover */ #define HA_RECOVER_DEFAULT 1 /* Automatic recover active */ |