diff options
| author | unknown <jimw@rama.(none)> | 2006-09-28 18:09:10 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-09-28 18:09:10 -0700 |
| commit | 44cdd695ab62ce115f1376cc63ee1c46e6f3b4b3 (patch) | |
| tree | f325a06780e46cb928226f1db47f7a001930ff47 /sql/set_var.cc | |
| parent | a59f477cde80dc1fbd354c1a0f7a7c722833822f (diff) | |
| parent | 915bdfbea873dd064edc28905945f2f098bb83e2 (diff) | |
| download | mariadb-git-44cdd695ab62ce115f1376cc63ee1c46e6f3b4b3.tar.gz | |
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
into rama.(none):/home/jimw/my/mysql-5.0-clean
include/m_ctype.h:
Auto merged
include/m_string.h:
Auto merged
include/my_global.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.h:
Auto merged
include/my_sys.h:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/mysqld.cc:
Resolve conflict
sql/opt_range.cc:
Resolve conflict
sql/sql_acl.cc:
Resolve conflict
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 */ |