bk commit into 5.0 tree (lzhou:1.2389) BUG#26675

[lzhou]

Below is the list of changes that have just been committed into a local
5.0 repository of zhl. When zhl 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, 2007-03-06 13:40:36+00:00, lzhou@dev3-63.(none) +3 -0
  BUG#26675 Add ndb_connectstring in show global variables

  sql/ha_ndbcluster.cc@stripped, 2007-03-06 13:40:30+00:00, lzhou@dev3-63.(none) +2 -0
    Add ndb_connectring variable

  sql/ha_ndbcluster.h@stripped, 2007-03-06 13:40:30+00:00, lzhou@dev3-63.(none) +1 -0
    Extern var_ndb_connectstring variable

  sql/set_var.cc@stripped, 2007-03-06 13:40:30+00:00, lzhou@dev3-63.(none) +4 -0
    Add ndb_connectstring variable to sys variable

# 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-63.(none)
# Root:	/home/zhl/mysql/mysql-5.0/bug26675

--- 1.298/sql/ha_ndbcluster.cc	2007-03-06 13:40:50 +00:00
+++ 1.299/sql/ha_ndbcluster.cc	2007-03-06 13:40:50 +00:00
@@ -122,6 +122,7 @@ pthread_mutex_t LOCK_ndb_util_thread;
 pthread_cond_t COND_ndb_util_thread;
 pthread_handler_t ndb_util_thread_func(void *arg);
 ulong ndb_cache_check_time;
+char var_ndb_connectstring[1024];
 
 /*
   Dummy buffer to read zero pack_length fields
@@ -5395,6 +5396,7 @@ bool ndbcluster_init()
 
 
   ndb_cache_check_time = opt_ndb_cache_check_time;
+  (void) strmake(var_ndb_connectstring,opt_ndbcluster_connectstring,
sizeof(var_ndb_connectstring)-1);
   // Create utility thread
   pthread_t tmp;
   if (pthread_create(&tmp, &connection_attrib, ndb_util_thread_func, 0))

--- 1.108/sql/ha_ndbcluster.h	2007-03-06 13:40:50 +00:00
+++ 1.109/sql/ha_ndbcluster.h	2007-03-06 13:40:50 +00:00
@@ -40,6 +40,7 @@ class NdbBlob;
 // connectstring to cluster if given by mysqld
 extern const char *ndbcluster_connectstring;
 extern ulong ndb_cache_check_time;
+extern char var_ndb_connectstring[];
 
 typedef enum ndb_index_type {
   UNDEFINED_INDEX = 0,

--- 1.176/sql/set_var.cc	2007-03-06 13:40:50 +00:00
+++ 1.177/sql/set_var.cc	2007-03-06 13:40:50 +00:00
@@ -476,6 +476,8 @@ sys_var_thd_bool
 sys_ndb_use_transactions("ndb_use_transactions", &SV::ndb_use_transactions);
 sys_var_long_ptr
 sys_ndb_cache_check_time("ndb_cache_check_time", &ndb_cache_check_time);
+sys_var_const_str
+sys_ndb_connectstring("ndb_connectstring", var_ndb_connectstring);
 #endif
 
 /* Time/date/datetime formats */
@@ -787,6 +789,7 @@ sys_var *sys_variables[]=
 #ifdef HAVE_NDBCLUSTER_DB
   &sys_ndb_autoincrement_prefetch_sz,
   &sys_ndb_cache_check_time,
+  &sys_ndb_connectstring,
   &sys_ndb_force_send,
   &sys_ndb_use_exact_count,
   &sys_ndb_use_transactions,
@@ -988,6 +991,7 @@ struct show_var_st init_vars[]= {
   {sys_ndb_use_exact_count.name,(char*) &sys_ndb_use_exact_count,   SHOW_SYS},
   {sys_ndb_use_transactions.name,(char*) &sys_ndb_use_transactions, SHOW_SYS},
   {sys_ndb_cache_check_time.name,(char*) &sys_ndb_cache_check_time, SHOW_SYS},
+  {sys_ndb_connectstring.name,(char*) &sys_ndb_connectstring, SHOW_SYS},
 #endif
   {sys_net_buffer_length.name,(char*) &sys_net_buffer_length,       SHOW_SYS},
   {sys_net_read_timeout.name, (char*) &sys_net_read_timeout,        SHOW_SYS},