MySQL-5.5.35 merge

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>

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)),

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 */
 {

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

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