diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:20:26 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:20:26 -0600 |
| commit | e52e3167c79d874628c47a50d8c8e0210a263085 (patch) | |
| tree | 3530dd1027b626d08c49a4bd8d57ba24d8424c45 /sql/mysqlbinlog.cc | |
| parent | 9ca5f114eade50b97308f711824fcfacd2135b72 (diff) | |
| download | mariadb-git-e52e3167c79d874628c47a50d8c8e0210a263085.tar.gz | |
bug fixes in server-id, moved replication functionality to
sql_repl.* will push this one, since the replication code now works
repl-tests/test-dump/run.test:
added slave/master reset
sql/Makefile.am:
added sql_repl.*
sql/log_event.cc:
moved #defines to log_event.h
sql/log_event.h:
moved #defines from log_event.cc
sql/mysql_priv.h:
added LOCK_server_id
sql/mysqlbinlog.cc:
added server id
sql/mysqld.cc:
added mutex_init for LOCK_server_id
sql/slave.cc:
added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
moved replication code to sql_repl.*
sql/sql_parse.cc:
moved replication code to sql_repl.*
Diffstat (limited to 'sql/mysqlbinlog.cc')
| -rw-r--r-- | sql/mysqlbinlog.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc index c7b31946349..2d1bde21f3f 100644 --- a/sql/mysqlbinlog.cc +++ b/sql/mysqlbinlog.cc @@ -270,8 +270,9 @@ static void dump_remote_log_entries(const char* logname) int4store(buf, position); int2store(buf + 4, binlog_flags); len = (uint) strlen(logname); - memcpy(buf + 6, logname,len); - if(mc_simple_command(mysql, COM_BINLOG_DUMP, buf, len + 6, 1)) + int4store(buf + 6, 0); + memcpy(buf + 10, logname,len); + if(mc_simple_command(mysql, COM_BINLOG_DUMP, buf, len + 10, 1)) die("Error sending the log dump command"); for(;;) |