From 863c73898fced0216b6dcadda99366fbf8f3cdfc Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Fri, 3 Dec 2004 21:26:14 +0000
Subject: added configure option to control extra ndb debug options, for
 release debug build please configure with --without-ndb-debug

---
 acinclude.m4 | 23 +++++++++++++++++++++++
 configure.in | 17 ++++++++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 81917372206..b43fad3ec70 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1624,6 +1624,11 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   --with-ndb-port-base  Base port for NDB Cluster transporters],
               [ndb_port_base="$withval"],
               [ndb_port_base="default"])
+  AC_ARG_WITH([ndb-debug],
+              [
+  --without-ndb-debug   Disable special ndb debug features],
+              [ndb_debug="$withval"],
+              [ndb_debug="no"])
                                                                                 
   AC_MSG_CHECKING([for NDB Cluster options])
   AC_MSG_RESULT([])
@@ -1663,6 +1668,24 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
       ;;
   esac
 
+  case "$ndb_debug" in
+    yes )
+      AC_MSG_RESULT([-- including ndb extra debug options])
+      with_ndb_debug="yes"
+      ;;
+    full )
+      AC_MSG_RESULT([-- including ndb extra extra debug options])
+      with_ndb_debug="full"
+      ;;
+    no )
+      AC_MSG_RESULT([-- not including ndb extra debug options])
+      with_ndb_debug="no"
+      ;;
+    * )
+      with_ndb_debug="default"
+      ;;
+  esac
+
   AC_MSG_RESULT([done.])
 ])
 
diff --git a/configure.in b/configure.in
index 4aa4b3c9845..4e5f919af2a 100644
--- a/configure.in
+++ b/configure.in
@@ -3039,15 +3039,26 @@ then
   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
 
   CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-  if test "$with_debug" = "yes"
+  if test "$with_ndb_debug" = "default"
+  then
+    with_ndb_debug = $with_debug
+  fi
+
+  if test "$with_ndb_debug" = "yes"
   then
     # Medium debug.
     NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
-  elif test "$with_debug" = "full"
+  elif test "$with_ndb_debug" = "full"
   then
     NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
   else
-    NDB_DEFS="-DNDEBUG"
+    # no extra ndb debug but still do asserts if debug version
+    if test "$with_debug" = "yes" -o "$with_debug" = "full"
+    then
+      NDB_DEFS=""
+    else
+      NDB_DEFS="-DNDEBUG"
+    fi
   fi
 
 AC_SUBST([NDB_DEFS])
-- 
cgit v1.2.1


From ca2e6e8192e082dc16dad8a88d98476f1281383d Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Mon, 6 Dec 2004 08:49:34 +0000
Subject: wixed ndb-debug option for configure

---
 acinclude.m4 | 10 +++++-----
 configure.in |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index b43fad3ec70..730ee15ed20 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1628,7 +1628,7 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
               [
   --without-ndb-debug   Disable special ndb debug features],
               [ndb_debug="$withval"],
-              [ndb_debug="no"])
+              [ndb_debug="default"])
                                                                                 
   AC_MSG_CHECKING([for NDB Cluster options])
   AC_MSG_RESULT([])
@@ -1671,18 +1671,18 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
   case "$ndb_debug" in
     yes )
       AC_MSG_RESULT([-- including ndb extra debug options])
-      with_ndb_debug="yes"
+      have_ndb_debug="yes"
       ;;
     full )
       AC_MSG_RESULT([-- including ndb extra extra debug options])
-      with_ndb_debug="full"
+      have_ndb_debug="full"
       ;;
     no )
       AC_MSG_RESULT([-- not including ndb extra debug options])
-      with_ndb_debug="no"
+      have_ndb_debug="no"
       ;;
     * )
-      with_ndb_debug="default"
+      have_ndb_debug="default"
       ;;
   esac
 
diff --git a/configure.in b/configure.in
index 4e5f919af2a..28d9d7c0f9c 100644
--- a/configure.in
+++ b/configure.in
@@ -3039,16 +3039,16 @@ then
   MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
 
   CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
-  if test "$with_ndb_debug" = "default"
+  if test "$have_ndb_debug" = "default"
   then
-    with_ndb_debug = $with_debug
+    have_ndb_debug=$with_debug
   fi
 
-  if test "$with_ndb_debug" = "yes"
+  if test "$have_ndb_debug" = "yes"
   then
     # Medium debug.
     NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
-  elif test "$with_ndb_debug" = "full"
+  elif test "$have_ndb_debug" = "full"
   then
     NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
   else
-- 
cgit v1.2.1