bk commit into 5.1 tree (tomas:1.2040)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2040 06/01/05 14:49:10 tomas@stripped +2 -0
  correcting compile error from merge

  sql/ha_ndbcluster_binlog.cc
    1.2 06/01/05 14:48:58 tomas@stripped +16 -12
    correcting compile error from merge

  sql/ha_ndbcluster.cc
    1.230 06/01/05 14:48:58 tomas@stripped +15 -11
    correcting compile error from merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6

--- 1.229/sql/ha_ndbcluster.cc	2006-01-05 12:55:42 +01:00
+++ 1.230/sql/ha_ndbcluster.cc	2006-01-05 14:48:58 +01:00
@@ -8510,6 +8510,7 @@
                        enum ha_stat_type stat_type)
 {
   char buf[IO_SIZE];
+  uint buflen;
   DBUG_ENTER("ndbcluster_show_status");
   
   if (have_ndbcluster != SHOW_OPTION_YES) 
@@ -8522,16 +8523,19 @@
   }
 
   update_status_variables(g_ndb_cluster_connection);
-  my_snprintf(buf, sizeof(buf),
-              "cluster_node_id=%u, "
-              "connected_host=%s, "
-              "connected_port=%u, "
-              "number_of_storage_nodes=%u",
-              ndb_cluster_node_id,
-              ndb_connected_host,
-              ndb_connected_port,
-              ndb_number_of_storage_nodes);
-  if (stat_print(thd, ndbcluster_hton.name, "connection", buf))
+  buflen=
+    my_snprintf(buf, sizeof(buf),
+                "cluster_node_id=%u, "
+                "connected_host=%s, "
+                "connected_port=%u, "
+                "number_of_storage_nodes=%u",
+                ndb_cluster_node_id,
+                ndb_connected_host,
+                ndb_connected_port,
+                ndb_number_of_storage_nodes);
+  if (stat_print(thd, ndbcluster_hton.name, strlen(ndbcluster_hton.name),
+                 "connection", strlen("connection"),
+                 buf, buflen))
     DBUG_RETURN(TRUE);
 
   if (get_thd_ndb(thd) && get_thd_ndb(thd)->ndb)
@@ -8540,7 +8544,7 @@
     Ndb::Free_list_usage tmp; tmp.m_name= 0;
     while (ndb->get_free_list_usage(&tmp))
     {
-      uint buflen=
+      buflen=
         my_snprintf(buf, sizeof(buf),
                   "created=%u, free=%u, sizeof=%u",
                   tmp.m_created, tmp.m_free, tmp.m_sizeof);

--- 1.1/sql/ha_ndbcluster_binlog.cc	2006-01-05 12:02:09 +01:00
+++ 1.2/sql/ha_ndbcluster_binlog.cc	2006-01-05 14:48:58 +01:00
@@ -2683,6 +2683,7 @@
                               enum ha_stat_type stat_type)
 {
   char buf[IO_SIZE];
+  uint buflen;
   ulonglong ndb_latest_epoch= 0;
   DBUG_ENTER("ndbcluster_show_status_binlog");
   
@@ -2692,18 +2693,21 @@
     ndb_latest_epoch= injector_ndb->getLatestGCI();
     pthread_mutex_unlock(&injector_mutex);
 
-    snprintf(buf, sizeof(buf),
-             "latest_epoch=%llu, "
-             "latest_trans_epoch=%llu, "
-             "latest_received_binlog_epoch=%llu, "
-             "latest_handled_binlog_epoch=%llu, "
-             "latest_applied_binlog_epoch=%llu",
-             ndb_latest_epoch,
-             g_latest_trans_gci,
-             ndb_latest_received_binlog_epoch,
-             ndb_latest_handled_binlog_epoch,
-             ndb_latest_applied_binlog_epoch);
-    if (stat_print(thd, ndbcluster_hton.name, "binlog", buf))
+    buflen=
+      snprintf(buf, sizeof(buf),
+               "latest_epoch=%llu, "
+               "latest_trans_epoch=%llu, "
+               "latest_received_binlog_epoch=%llu, "
+               "latest_handled_binlog_epoch=%llu, "
+               "latest_applied_binlog_epoch=%llu",
+               ndb_latest_epoch,
+               g_latest_trans_gci,
+               ndb_latest_received_binlog_epoch,
+               ndb_latest_handled_binlog_epoch,
+               ndb_latest_applied_binlog_epoch);
+    if (stat_print(thd, ndbcluster_hton.name, strlen(ndbcluster_hton.name),
+                   "binlog", strlen("binlog"),
+                   buf, buflen))
       DBUG_RETURN(TRUE);
   }
   else