summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorjimw@rama.(none) <>2006-09-28 18:11:29 -0700
committerjimw@rama.(none) <>2006-09-28 18:11:29 -0700
commitcaf4392f71d39c9f5b50d0271a71f5e5a0953cd6 (patch)
tree1e61b6e0101239baef40aeb43e59feb46919c92e /sql/set_var.cc
parent06ea6d732340a67c257b2ad5de1714463f45e383 (diff)
parentcb6a084076d4688c11936bfa91b03a83570f69e0 (diff)
downloadmariadb-git-caf4392f71d39c9f5b50d0271a71f5e5a0953cd6.tar.gz
Merge bk-internal:/home/bk/mysql-4.1-maint
into rama.(none):/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 4acedc7bcbd..21370821dff 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1150,14 +1150,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 */