From d8c4f4f1cfcc5e938efd4d09da9b3fc581a0c6f3 Mon Sep 17 00:00:00 2001
From: David Hall <david.hall@mariadb.com>
Date: Tue, 28 Jun 2016 16:27:35 -0500
Subject: [PATCH] Set up so that configure --with-debug works

---
 dbcon/mysql/ha_calpont_impl_if.h |  2 +-
 dbcon/mysql/idb_mysql.h          | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dbcon/mysql/ha_calpont_impl_if.h b/dbcon/mysql/ha_calpont_impl_if.h
index 8132a8070..d39aefd46 100644
--- a/dbcon/mysql/ha_calpont_impl_if.h
+++ b/dbcon/mysql/ha_calpont_impl_if.h
@@ -46,7 +46,7 @@ struct st_ha_create_information;
 #include "functor.h"
 
 /** Debug macro */
-#if INFINIDB_DEBUG
+#ifdef INFINIDB_DEBUG
 #define IDEBUG(x) {x;}
 #else
 #define IDEBUG(x) {}
diff --git a/dbcon/mysql/idb_mysql.h b/dbcon/mysql/idb_mysql.h
index b12d51cf5..bd82b0bd3 100644
--- a/dbcon/mysql/idb_mysql.h
+++ b/dbcon/mysql/idb_mysql.h
@@ -34,12 +34,20 @@ template <class T> bool isnan(T);
 #undef LOG_INFO
 
 #ifdef _DEBUG
+#ifndef _MSC_VER
+#define SAFE_MUTEX
 #define SAFEMALLOC
+#endif
+#define ENABLED_DEBUG_SYNC
+#define INFINIDB_DEBUG
 #define DBUG_ON 1
 #undef  DBUG_OFF
 #else
-#define DBUG_OFF 1
+#undef SAFE_MUTEX
+#undef SAFEMALLOC
+#undef ENABLED_DEBUG_SYNC
 #undef DBUG_ON
+#define DBUG_OFF 1
 #endif
 #ifdef _MSC_VER
 #define MYSQL_DYNAMIC_PLUGIN