diff options
| author | unknown <guilhem@mysql.com> | 2005-03-02 14:46:19 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-03-02 14:46:19 +0100 |
| commit | 8fdc684b0b2baf7027ffaf38fa429336532e71c1 (patch) | |
| tree | 1c8645b3394eda9c467075dda8b2f3849b1fc635 /sql/set_var.cc | |
| parent | 21a6c52c4f6e516e2d3348e77c031d1c6aa9681f (diff) | |
| parent | 91820633ac234514a617b9251cc82f50b47e16ed (diff) | |
| download | mariadb-git-8fdc684b0b2baf7027ffaf38fa429336532e71c1.tar.gz | |
Merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
SCCS merged
sql/slave.h:
SCCS merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index fc0802bf185..ad8eaee10f2 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -340,6 +340,8 @@ sys_var_bool_ptr sys_slave_compressed_protocol("slave_compressed_protocol", #ifdef HAVE_REPLICATION sys_var_long_ptr sys_slave_net_timeout("slave_net_timeout", &slave_net_timeout); +sys_var_long_ptr sys_slave_trans_retries("slave_transaction_retries", + &slave_trans_retries); #endif sys_var_long_ptr sys_slow_launch_time("slow_launch_time", &slow_launch_time); @@ -652,6 +654,7 @@ sys_var *sys_variables[]= #ifdef HAVE_REPLICATION &sys_slave_compressed_protocol, &sys_slave_net_timeout, + &sys_slave_trans_retries, &sys_slave_skip_counter, #endif &sys_slow_launch_time, @@ -931,6 +934,7 @@ struct show_var_st init_vars[]= { {"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL}, #ifdef HAVE_REPLICATION {sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout, SHOW_SYS}, + {sys_slave_trans_retries.name,(char*) &sys_slave_trans_retries, SHOW_SYS}, #endif {sys_slow_launch_time.name, (char*) &sys_slow_launch_time, SHOW_SYS}, #ifdef HAVE_SYS_UN_H |