database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge rama.(none):/home/jimw/my/mysql-4.1-clean

Browse Source 
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
This commit is contained in:
unknown
2006-09-28 18:09:10 -07:00
parent a59f477cde 915bdfbea8
commit 44cdd695ab
12 changed files with 57 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@@ -306,7 +306,7 @@ public:
const char *log_name);
void new_file(bool need_lock);
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