bk commit into 5.1 tree (mtaylor:1.2589)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor.  When mtaylor does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-29 00:51:49-07:00, mtaylor@solace.(none) +1 -0
  Reverted ndb_api_trace. Added API_TRACE to debug=full.

  config/ac-macros/ha_ndbcluster.m4@stripped, 2008-04-29 00:51:47-07:00, mtaylor@solace.(none) +1 -13
    Reverted ndb_api_trace. Added API_TRACE to debug=full

diff -Nrup a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
--- a/config/ac-macros/ha_ndbcluster.m4	2008-04-29 00:28:42 -07:00
+++ b/config/ac-macros/ha_ndbcluster.m4	2008-04-29 00:51:47 -07:00
@@ -87,11 +87,6 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
                               [Disable ndb binlog])],
               [ndb_binlog="$withval"],
               [ndb_binlog="default"])
-  AC_ARG_WITH([ndb-api-trace],
-              [AC_HELP_STRING([--with-ndb-api-trace],
-                              [Turn on NDB API Tracing])],
-              [ndb_api_trace=yes],
-              [ndb_api_trace=no])
 
   case "$ndb_ccflags" in
     "yes")
@@ -209,7 +204,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
     NDB_DEFS="-DNDB_DEBUG -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
   elif test "$have_ndb_debug" = "full"
   then
-    NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD"
+    NDB_DEFS="-DNDB_DEBUG_FULL -DVM_TRACE -DERROR_INSERT -DARRAY_GUARD -DAPI_TRACE"
   else
     # no extra ndb debug but still do asserts if debug version
     if test "$with_debug" = "yes" -o "$with_debug" = "full"
@@ -240,13 +235,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
   else
     AC_MSG_RESULT([Not including Ndb Cluster Binlog])
   fi
-
-  if test X"$ndb_api_trace" = Xyes
-  then
-    AC_DEFINE([API_TRACE], [1],
-              [NDB API Tracing])
-    AC_MSG_RESULT([Enabling NDB API Tracing])
-  fi   
 
   ndb_transporter_opt_objs=""
   if test "$ac_cv_func_shmget" = "yes" &&