bk commit into 5.0 tree (lzhou:1.2464)

[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-04-28 14:55:39+00:00, lzhou@dev3-63.(none) +2 -0
  Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/ndb-test
  into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/ndb-bj-test
  MERGE: 1.2425.57.1

  sql/ha_ndbcluster.h@stripped, 2007-04-28 14:55:27+00:00, lzhou@dev3-63.(none) +0 -0
    Auto merged
    MERGE: 1.111.1.1

  sql/set_var.cc@stripped, 2007-04-28 14:55:28+00:00, lzhou@dev3-63.(none) +0 -0
    Auto merged
    MERGE: 1.181.2.1

# 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/ndb-bj-test/RESYNC

--- 1.114/sql/ha_ndbcluster.h	2007-04-28 14:55:54 +00:00
+++ 1.115/sql/ha_ndbcluster.h	2007-04-28 14:55:54 +00:00
@@ -40,6 +40,7 @@ class ha_ndbcluster_cond;
 // connectstring to cluster if given by mysqld
 extern const char *ndbcluster_connectstring;
 extern ulong ndb_cache_check_time;
+extern char opt_ndb_constrbuf[];
 
 typedef enum ndb_index_type {
   UNDEFINED_INDEX = 0,

--- 1.183/sql/set_var.cc	2007-04-28 14:55:54 +00:00
+++ 1.184/sql/set_var.cc	2007-04-28 14:55:54 +00:00
@@ -475,6 +475,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", opt_ndb_constrbuf);
 #endif
 
 /* Time/date/datetime formats */
@@ -792,6 +794,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,
@@ -996,6 +999,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},