bk commit into 5.1 tree (lzhou:1.2552)

[lzhou]

Below is the list of changes that have just been committed into a local
5.1 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-17 18:13:20+00:00, lzhou@dev3-63.(none) +2 -0
  Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug26675
  into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26675
  MERGE: 1.1810.2648.2

  sql/ha_ndbcluster.h@stripped, 2007-04-17 18:13:12+00:00, lzhou@dev3-63.(none) +1 -1
    remove "extern opt_ndb_constrbuf" in 5.1
    MERGE: 1.82.8.1

  sql/set_var.cc@stripped, 2007-04-17 18:13:12+00:00, lzhou@dev3-63.(none) +2 -2
    add ndb_connectstring variable
    MERGE: 1.125.24.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.1/bug26675/RESYNC

--- 1.174/sql/ha_ndbcluster.h	2007-04-17 18:13:38 +00:00
+++ 1.175/sql/ha_ndbcluster.h	2007-04-17 18:13:38 +00:00
@@ -46,6 +46,7 @@ class NdbEventOperation;
 // connectstring to cluster if given by mysqld
 extern const char *ndbcluster_connectstring;
 extern ulong ndb_cache_check_time;
+
 #ifdef HAVE_NDB_BINLOG
 extern ulong ndb_report_thresh_binlog_epoch_slip;
 extern ulong ndb_report_thresh_binlog_mem_usage;

--- 1.224/sql/set_var.cc	2007-04-17 18:13:38 +00:00
+++ 1.225/sql/set_var.cc	2007-04-17 18:13:38 +00:00
@@ -95,6 +95,7 @@ extern ulong srv_flush_log_at_trx_commit
 
 /* WITH_NDBCLUSTER_STORAGE_ENGINE */
 extern ulong ndb_cache_check_time;
+extern char opt_ndb_constrbuf[];
 extern ulong ndb_extra_logging;
 #ifdef HAVE_NDB_BINLOG
 extern ulong ndb_report_thresh_binlog_epoch_slip;
@@ -547,6 +548,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);
 sys_var_thd_bool
 sys_ndb_index_stat_enable("ndb_index_stat_enable",
                           &SV::ndb_index_stat_enable);
@@ -924,6 +927,7 @@ SHOW_VAR init_vars[]= {
   {sys_ndb_autoincrement_prefetch_sz.name,
    (char*) &sys_ndb_autoincrement_prefetch_sz,                      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},
   {sys_ndb_extra_logging.name,(char*) &sys_ndb_extra_logging,       SHOW_SYS},
   {sys_ndb_force_send.name,   (char*) &sys_ndb_force_send,          SHOW_SYS},
   {sys_ndb_index_stat_cache_entries.name, (char*) &sys_ndb_index_stat_cache_entries,
SHOW_SYS},