diff options
| author | lzhou/zhl@dev3-63.(none) <> | 2007-04-20 12:36:10 +0000 |
|---|---|---|
| committer | lzhou/zhl@dev3-63.(none) <> | 2007-04-20 12:36:10 +0000 |
| commit | ff7493b3b649e0d52ae98599cb1c6267f55c8cce (patch) | |
| tree | 0c82a7685dba3c5683239892a7e4ca0c75771b15 /sql/set_var.cc | |
| parent | 042dfb1dfca083de5d5a25945190a53845d9c79d (diff) | |
| download | mariadb-git-ff7493b3b649e0d52ae98599cb1c6267f55c8cce.tar.gz | |
BUG#26675 remove additional varialbes definations in mysqld.cc and add NDBCLUSTER macro in set_var.cc
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d63ba62da6c..5b5ae8b1bd6 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -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}, |