diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
| commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
| tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /storage/maria | |
| parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
| parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
| download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz | |
MySQL-5.5.35 merge
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_check.c | 1 | ||||
| -rw-r--r-- | storage/maria/ma_check_standalone.h | 2 | ||||
| -rw-r--r-- | storage/maria/ma_recovery.c | 1 | ||||
| -rw-r--r-- | storage/maria/ma_sort.c | 1 | ||||
| -rw-r--r-- | storage/maria/maria_chk.c | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index b7bd08d8bb7..3be4465c71e 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_check.c @@ -45,6 +45,7 @@ #include "ma_blockrec.h" #include "trnman.h" #include "ma_key_recover.h" +#include <my_check_opt.h> #include <stdarg.h> #include <my_getopt.h> diff --git a/storage/maria/ma_check_standalone.h b/storage/maria/ma_check_standalone.h index 3ac8cdb5e38..241bc7c2739 100644 --- a/storage/maria/ma_check_standalone.h +++ b/storage/maria/ma_check_standalone.h @@ -13,6 +13,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <my_check_opt.h> + /* almost every standalone maria program will need it */ void _mi_report_crashed(void *file __attribute__((unused)), const char *message __attribute__((unused)), diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c index 0f3fb0f8a1e..5e42ebc8d5d 100644 --- a/storage/maria/ma_recovery.c +++ b/storage/maria/ma_recovery.c @@ -29,6 +29,7 @@ #include "ma_key_recover.h" #include "ma_recovery_util.h" #include "hash.h" +#include <my_check_opt.h> struct st_trn_for_recovery /* used only in the REDO phase */ { diff --git a/storage/maria/ma_sort.c b/storage/maria/ma_sort.c index e1e7b323683..95454d88308 100644 --- a/storage/maria/ma_sort.c +++ b/storage/maria/ma_sort.c @@ -19,6 +19,7 @@ */ #include "ma_fulltext.h" +#include <my_check_opt.h> #if defined(MSDOS) || defined(__WIN__) #include <fcntl.h> #else diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 05a5aefb4f4..57c958b4b6d 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -21,6 +21,7 @@ #include <m_ctype.h> #include <stdarg.h> #include <my_getopt.h> +#include <my_check_opt.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif |