database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

Browse Source 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
This commit is contained in:
Justin.He/justin.he@dev3-240.dev.cn.tlan
2007-04-28 13:36:05 +08:00
parent fa32db5f88 3189a4de5f
commit 71bac85adf
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/ha_ndbcluster.h
View File

@@ -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,

4
sql/set_var.cc
View File

@@ -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},