bk commit into 5.0 tree (lzhou:1.2249)

[lzhou]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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, 2006-08-28 16:18:48+00:00, lzhou@stripped +5 -0
  Merge lzhou@stripped:/home/bk/mysql-5.0-ndb
  into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj
  MERGE: 1.2216.10.13

  ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2006-08-28 16:18:44+00:00, lzhou@stripped +0 -0
    Auto merged
    MERGE: 1.63.3.1

  ndb/src/ndbapi/ndberror.c@stripped, 2006-08-28 16:18:44+00:00, lzhou@stripped +0 -0
    Auto merged
    MERGE: 1.46.1.1

  sql/ha_ndbcluster.cc@stripped, 2006-08-28 16:18:44+00:00, lzhou@stripped +0 -0
    Auto merged
    MERGE: 1.273.1.1

  sql/sql_base.cc@stripped, 2006-08-28 16:18:44+00:00, lzhou@stripped +0 -0
    Auto merged
    MERGE: 1.347.1.1

  sql/sql_view.cc@stripped, 2006-08-28 16:18:44+00:00, lzhou@stripped +0 -0
    Auto merged
    MERGE: 1.89.1.8

# 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:	lzhou
# Host:	dev3-138.dev.cn.tlan
# Root:	/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj/RESYNC

--- 1.67/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-28 16:18:55 +00:00
+++ 1.68/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-28 16:18:55 +00:00
@@ -1569,6 +1569,7 @@
 
     if(it == 0){
       ndbout_c("Unable to create config iterator");
+      ndb_mgm_destroy_configuration(conf);
       return;
     }
     NdbAutoPtr<ndb_mgm_configuration_iterator> ptr(it);
@@ -1615,6 +1616,7 @@
     print_nodes(state, it, "ndb_mgmd", mgm_nodes, NDB_MGM_NODE_TYPE_MGM, 0);
     print_nodes(state, it, "mysqld",   api_nodes, NDB_MGM_NODE_TYPE_API, 0);
     //    ndbout << helpTextShow;
+    ndb_mgm_destroy_configuration(conf);
     return;
   } else if (strcasecmp(parameters, "PROPERTIES") == 0 ||
 	     strcasecmp(parameters, "PROP") == 0) {

--- 1.277/sql/ha_ndbcluster.cc	2006-08-28 16:18:55 +00:00
+++ 1.278/sql/ha_ndbcluster.cc	2006-08-28 16:18:55 +00:00
@@ -147,7 +147,7 @@
 static const char * ndb_connected_host= 0;
 static long ndb_connected_port= 0;
 static long ndb_number_of_replicas= 0;
-static long ndb_number_of_storage_nodes= 0;
+static long ndb_number_of_data_nodes= 0;
 
 static int update_status_variables(Ndb_cluster_connection *c)
 {
@@ -155,7 +155,7 @@
   ndb_connected_port=          c->get_connected_port();
   ndb_connected_host=          c->get_connected_host();
   ndb_number_of_replicas=      0;
-  ndb_number_of_storage_nodes= c->no_db_nodes();
+  ndb_number_of_data_nodes= c->no_db_nodes();
   return 0;
 }
 
@@ -164,7 +164,7 @@
   {"config_from_host",         (char*) &ndb_connected_host,      SHOW_CHAR_PTR},
   {"config_from_port",         (char*) &ndb_connected_port,          SHOW_LONG},
 //  {"number_of_replicas",     (char*) &ndb_number_of_replicas,      SHOW_LONG},
-  {"number_of_storage_nodes",(char*) &ndb_number_of_storage_nodes, SHOW_LONG},
+  {"number_of_data_nodes",(char*) &ndb_number_of_data_nodes, SHOW_LONG},
   {NullS, NullS, SHOW_LONG}
 };
 

--- 1.47/ndb/src/ndbapi/ndberror.c	2006-08-28 16:18:55 +00:00
+++ 1.48/ndb/src/ndbapi/ndberror.c	2006-08-28 16:18:55 +00:00
@@ -378,7 +378,7 @@
   { 1305, IE, "Backup definition not implemented" },
   { 1306, AE, "Backup not supported in diskless mode (change Diskless)" },
 
-  { 1321, IE, "Backup aborted by application" },
+  { 1321, UD, "Backup aborted by user request" },
   { 1322, IE, "Backup already completed" },
   { 1323, IE, "1323" },
   { 1324, IE, "Backup log buffer full" },