diff options
| author | unknown <jimw@rama.(none)> | 2006-09-28 18:11:29 -0700 |
|---|---|---|
| committer | unknown <jimw@rama.(none)> | 2006-09-28 18:11:29 -0700 |
| commit | 9afa051a12b9adc7285915621d0a127d670e9c21 (patch) | |
| tree | 1e61b6e0101239baef40aeb43e59feb46919c92e /sql/sql_class.h | |
| parent | 1bb27aeab1f671ff313872be2cb7f1dfa0d92aea (diff) | |
| parent | 915bdfbea873dd064edc28905945f2f098bb83e2 (diff) | |
| download | mariadb-git-9afa051a12b9adc7285915621d0a127d670e9c21.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1-maint
into rama.(none):/home/jimw/my/mysql-4.1-clean
include/my_global.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/mysqld.cc:
Resolve conflict
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index a995a492bc8..cc90de2a6ea 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -145,7 +145,7 @@ public: bool no_auto_events_arg, ulong max_size); void new_file(bool need_lock= 1); bool write(THD *thd, enum enum_server_command command, - const char *format,...); + const char *format, ...) ATTRIBUTE_FORMAT(printf, 4, 5); bool write(THD *thd, const char *query, uint query_length, time_t query_start=0); bool write(Log_event* event_info); // binary log write |