Merge branch 'master' into releases/tokudb-7.5

447a7949 · Rich Prohaska · 5743dc9b · c14fdb70 · 447a7949
Commit 447a7949 authored Nov 06, 2014 by Rich Prohaska
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

storage/tokudb/ha_tokudb.cc storage/tokudb/ha_tokudb.cc +1 -0

No files found.
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -92,6 +92,7 @@ PATENT RIGHTS GRANT:
 #pragma implementation          // gcc: Class implementation
 #endif

+#include <my_config.h>
 extern "C" {
 #include "stdint.h"
 #define __STDC_FORMAT_MACROS