diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2010-02-28 19:47:16 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2010-02-28 19:47:16 +0200 |
| commit | 82fe344cbe909c7526bb87af8dc78586341154a1 (patch) | |
| tree | 81f6d95c01a7436d1fa9b7936c3e4135083eab67 /sql/mysql_priv.h | |
| parent | 88f4990c3333a720b09e43c095bb4257332177c4 (diff) | |
| parent | 055c61049e32572464495ef23d0cdf158e083dda (diff) | |
| download | mariadb-git-82fe344cbe909c7526bb87af8dc78586341154a1.tar.gz | |
merging to 6.0-codebase-bugfixing from a local branch
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 20720d50194..d5df0ab5930 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1965,7 +1965,8 @@ extern ulong slow_launch_threads, slow_launch_time; extern ulong table_cache_size, table_def_size; extern MYSQL_PLUGIN_IMPORT ulong max_connections; extern ulong max_connect_errors, connect_timeout; -extern ulong slave_net_timeout, slave_trans_retries; +extern ulong slave_trans_retries; +extern uint slave_net_timeout; extern ulong what_to_log,flush_time; extern ulong query_buff_size; extern ulong max_prepared_stmt_count, prepared_stmt_count; |