diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-03-15 15:22:40 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-03-15 15:22:40 +0100 |
| commit | ef2ca9781cbcc6376480751d8d7a657237789218 (patch) | |
| tree | 0a8c610a9510f70ece94b567977029ba13e1d265 /sql/set_var.cc | |
| parent | 9af776c8cbad88bf4d42686c91a6aa8a67484d56 (diff) | |
| parent | aa5dba42ef7e68cb013d36c689fec4ec62a14f1d (diff) | |
| download | mariadb-git-ef2ca9781cbcc6376480751d8d7a657237789218.tar.gz | |
Merged WL#2269 to mysql-5.0
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/ha_ndbcluster.cc:
Manual merge
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 6e1843ec127..1f4713471ba 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -413,7 +413,7 @@ sys_engine_condition_pushdown("engine_condition_pushdown", #ifdef HAVE_NDBCLUSTER_DB /* ndb thread specific variable settings */ -sys_var_thd_ulong +sys_var_thd_ulong sys_ndb_autoincrement_prefetch_sz("ndb_autoincrement_prefetch_sz", &SV::ndb_autoincrement_prefetch_sz); sys_var_thd_bool @@ -422,7 +422,8 @@ sys_var_thd_bool sys_ndb_use_exact_count("ndb_use_exact_count", &SV::ndb_use_exact_count); 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_long_ptr +sys_ndb_cache_check_time("ndb_cache_check_time", &ndb_cache_check_time); #endif /* Time/date/datetime formats */ @@ -702,10 +703,10 @@ sys_var *sys_variables[]= &sys_engine_condition_pushdown, #ifdef HAVE_NDBCLUSTER_DB &sys_ndb_autoincrement_prefetch_sz, + &sys_ndb_cache_check_time, &sys_ndb_force_send, &sys_ndb_use_exact_count, &sys_ndb_use_transactions, - &sys_ndb_cache_check_time, #endif &sys_unique_checks, &sys_updatable_views_with_limit, @@ -1298,7 +1299,6 @@ static int check_max_delayed_threads(THD *thd, set_var *var) return 0; } - static void fix_max_connections(THD *thd, enum_var_type type) { #ifndef EMBEDDED_LIBRARY |