diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-28 16:24:50 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-28 16:24:50 -0600 |
| commit | af033a3255c41cc18246fcbca7e7215f16f574b1 (patch) | |
| tree | 4910abb45b14da730ae90a0d22d7b18a4fc7135c /sql/mysqlbinlog.cc | |
| parent | 17d6b65a71afc72add70778178a1f79346a61a71 (diff) | |
| download | mariadb-git-af033a3255c41cc18246fcbca7e7215f16f574b1.tar.gz | |
This one will not be pushed, I am committing to be able to pull in Monty's changes
added server id, mostly working
added --skip-slave-start, working
added --replicate-rewrite-db - just in the cmd line parses, currently noop
sql/log_event.cc:
added server id
sql/log_event.h:
added server id
sql/mysql_priv.h:
server id
sql/mysqlbinlog.cc:
server id
sql/mysqld.cc:
server id, --skip-slave-start, --replicate-rewrite-db
sql/share/romanian/errmsg.sys:
somehow got touched and bk thinks it is modified
sql/slave.cc:
server id, fixed typo in error message, cleaned up
sql/sql_class.cc:
server id in THD
sql/sql_class.h:
server id in THD
Diffstat (limited to 'sql/mysqlbinlog.cc')
| -rw-r--r-- | sql/mysqlbinlog.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc index dd34230bc1a..c7b31946349 100644 --- a/sql/mysqlbinlog.cc +++ b/sql/mysqlbinlog.cc @@ -29,6 +29,8 @@ #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES) +char server_version[50]; +uint32 server_id = 0; // needed by net_serv.c ulong bytes_sent = 0L, bytes_received = 0L; |