diff options
| author | jimw@rama.(none) <> | 2006-09-28 18:09:10 -0700 |
|---|---|---|
| committer | jimw@rama.(none) <> | 2006-09-28 18:09:10 -0700 |
| commit | 68eadc8a793923c95d2a4a07a689d050b79f61f4 (patch) | |
| tree | f325a06780e46cb928226f1db47f7a001930ff47 /sql/set_var.cc | |
| parent | 9c3012e646420c2760daf541f7aaefb13c7d3e1e (diff) | |
| parent | cb6a084076d4688c11936bfa91b03a83570f69e0 (diff) | |
| download | mariadb-git-68eadc8a793923c95d2a4a07a689d050b79f61f4.tar.gz | |
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
into rama.(none):/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index c667e2f2bcc..9dd3da55091 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1295,14 +1295,14 @@ static void fix_net_retry_count(THD *thd, enum_var_type type) thd->net.retry_count=thd->variables.net_retry_count; } #else /* HAVE_REPLICATION */ -static void fix_net_read_timeout(THD *thd __attribute__(unused), - enum_var_type type __attribute__(unused)) +static void fix_net_read_timeout(THD *thd __attribute__((unused)), + enum_var_type type __attribute__((unused))) {} -static void fix_net_write_timeout(THD *thd __attribute__(unused), - enum_var_type type __attribute__(unused)) +static void fix_net_write_timeout(THD *thd __attribute__((unused)), + enum_var_type type __attribute__((unused))) {} -static void fix_net_retry_count(THD *thd __attribute__(unused), - enum_var_type type __attribute__(unused)) +static void fix_net_retry_count(THD *thd __attribute__((unused)), + enum_var_type type __attribute__((unused))) {} #endif /* HAVE_REPLICATION */ |