bk commit into 5.1 tree (lzhou:1.2553) BUG#26675

[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-20 12:36:10+00:00, lzhou@dev3-63.(none) +2 -0
  BUG#26675 remove additional varialbes definations in mysqld.cc and add NDBCLUSTER macro
in set_var.cc

  sql/mysqld.cc@stripped, 2007-04-20 12:36:03+00:00, lzhou@dev3-63.(none) +1 -6
    remove additional variables defination in none-ndbcluster engines.

  sql/set_var.cc@stripped, 2007-04-20 12:36:03+00:00, lzhou@dev3-63.(none) +7 -0
    add NDBCLUSTER macro

# 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

--- 1.627/sql/mysqld.cc	2007-04-20 12:36:32 +00:00
+++ 1.628/sql/mysqld.cc	2007-04-20 12:36:32 +00:00
@@ -412,7 +412,7 @@ extern ulong srv_flush_log_at_trx_commit
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 const char *opt_ndbcluster_connectstring= 0;
 const char *opt_ndb_connectstring= 0;
-char opt_ndb_constrbuf[1024];
+char opt_ndb_constrbuf[1024]= {0};
 unsigned opt_ndb_constrbuf_len= 0;
 my_bool	opt_ndb_shm, opt_ndb_optimized_node_selection;
 ulong opt_ndb_cache_check_time;
@@ -8431,11 +8431,6 @@ ulong srv_thread_concurrency;
 ulong srv_commit_concurrency;
 }
 
-#endif
-
-#ifndef WITH_NDBCLUSTER_STORAGE_ENGINE
-ulong ndb_cache_check_time;
-ulong ndb_extra_logging;
 #endif
 
 /*****************************************************************************

--- 1.225/sql/set_var.cc	2007-04-20 12:36:32 +00:00
+++ 1.226/sql/set_var.cc	2007-04-20 12:36:32 +00:00
@@ -94,9 +94,12 @@ extern ulong srv_flush_log_at_trx_commit
 }
 
 /* WITH_NDBCLUSTER_STORAGE_ENGINE */
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 extern ulong ndb_cache_check_time;
 extern char opt_ndb_constrbuf[];
 extern ulong ndb_extra_logging;
+#endif
+
 #ifdef HAVE_NDB_BINLOG
 extern ulong ndb_report_thresh_binlog_epoch_slip;
 extern ulong ndb_report_thresh_binlog_mem_usage;
@@ -528,6 +531,7 @@ sys_var_thd_bool
 sys_engine_condition_pushdown("engine_condition_pushdown",
 			      &SV::engine_condition_pushdown);
 
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 /* ndb thread specific variable settings */
 sys_var_thd_ulong
 sys_ndb_autoincrement_prefetch_sz("ndb_autoincrement_prefetch_sz",
@@ -563,6 +567,7 @@ sys_var_long_ptr
 sys_ndb_extra_logging("ndb_extra_logging", &ndb_extra_logging);
 sys_var_thd_bool
 sys_ndb_use_copying_alter_table("ndb_use_copying_alter_table",
&SV::ndb_use_copying_alter_table);
+#endif //WITH_NDBCLUSTER_STORAGE_ENGINE
 
 /* Time/date/datetime formats */
 
@@ -924,6 +929,7 @@ SHOW_VAR init_vars[]= {
 #ifdef __NT__
   {"named_pipe",	      (char*) &opt_enable_named_pipe,       SHOW_MY_BOOL},
 #endif
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
   {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},
@@ -943,6 +949,7 @@ SHOW_VAR init_vars[]= {
    (char*) &sys_ndb_use_copying_alter_table,                        SHOW_SYS},
   {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},
+#endif //WITH_NDBCLUSTER_STORAGE_ENGINE
   {sys_net_buffer_length.name,(char*) &sys_net_buffer_length,       SHOW_SYS},
   {sys_net_read_timeout.name, (char*) &sys_net_read_timeout,        SHOW_SYS},
   {sys_net_retry_count.name,  (char*) &sys_net_retry_count,	    SHOW_SYS},