Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

2 files changed, 90 insertions, 1 deletions

diff --git a/storage/ndb/test/tools/Makefile.am b/storage/ndb/test/tools/Makefile.am
index 3a2bcb5005f..91cc1a4796c 100644
--- a/storage/ndb/test/tools/Makefile.am
+++ b/storage/ndb/test/tools/Makefile.am
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord  hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index  ndb_cpcc listen_event rep_latency
+ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord  hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index  ndb_cpcc listen_event rep_latency eventlog
 
 # transproxy 
 
@@ -33,6 +33,7 @@ copy_tab_SOURCES = copy_tab.cpp
 create_index_SOURCES = create_index.cpp
 ndb_cpcc_SOURCES = cpcc.cpp
 listen_event_SOURCES = listen.cpp
+eventlog_SOURCES = log_listner.cpp
 rep_latency_SOURCES = rep_latency.cpp
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
diff --git a/storage/ndb/test/tools/log_listner.cpp b/storage/ndb/test/tools/log_listner.cpp
new file mode 100644
index 00000000000..c5125ef7414
--- /dev/null
+++ b/storage/ndb/test/tools/log_listner.cpp
@@ -0,0 +1,88 @@
+#include <mgmapi.h>
+#include <ndb_global.h>
+#include <ndb_opts.h>
+#include <NDBT.hpp>
+
+NDB_STD_OPTS_VARS;
+
+static struct my_option my_long_options[] =
+{
+  NDB_STD_OPTS("ndb_logevent_listen"),
+  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+static void usage()
+{
+  char desc[] = 
+    "tabname\n"\
+    "This program list all properties of table(s) in NDB Cluster.\n"\
+    "  ex: desc T1 T2 T4\n";
+  ndb_std_print_version();
+  my_print_help(my_long_options);
+  my_print_variables(my_long_options);
+}
+
+int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_BACKUP,
+		 15, NDB_MGM_EVENT_CATEGORY_CONNECTION,
+		 15, NDB_MGM_EVENT_CATEGORY_NODE_RESTART,
+		 15, NDB_MGM_EVENT_CATEGORY_STARTUP,
+		 15, NDB_MGM_EVENT_CATEGORY_SHUTDOWN,
+		 15, NDB_MGM_EVENT_CATEGORY_STATISTIC,
+		 15, NDB_MGM_EVENT_CATEGORY_ERROR,
+		 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT,
+		 15, NDB_MGM_EVENT_CATEGORY_CONGESTION,
+		 0 };
+
+int 
+main(int argc, char** argv)
+{
+  NDB_INIT(argv[0]);
+  const char *load_default_groups[]= { "mysql_cluster",0 };
+  load_defaults("my",load_default_groups,&argc,&argv);
+  int ho_error;
+#ifndef DBUG_OFF
+  opt_debug= "d:t:O,/tmp/ndb_desc.trace";
+#endif
+  if ((ho_error=handle_options(&argc, &argv, my_long_options, 
+			       ndb_std_get_one_option)))
+    return NDBT_ProgramExit(NDBT_WRONGARGS);
+
+  NdbMgmHandle handle= ndb_mgm_create_handle();
+  ndb_mgm_set_connectstring(handle, opt_connect_str);
+  
+  while (true)
+  {
+    if (ndb_mgm_connect(handle,0,0,0) == -1)
+    {
+      ndbout_c("Failed to connect");
+      exit(0);
+    }
+    
+    NdbLogEventHandle le = ndb_mgm_create_logevent_handle(handle, filter);
+    if (le == 0)
+    {
+      ndbout_c("Failed to create logevent handle");
+      exit(0);
+    }
+    
+    struct ndb_logevent event;
+    while (true)
+    {
+      int r= ndb_logevent_get_next(le, &event,5000);
+      if (r < 0)
+      {
+	ndbout_c("Error while getting next event");
+	break;
+      }
+      if (r == 0)
+      {
+	continue;
+      }
+      ndbout_c("Got event: %d", event.type);
+    }
+    
+    ndb_mgm_destroy_logevent_handle(&le);
+    ndb_mgm_disconnect(handle);
+  }
+
+  return 0;
+}