diff options
author | monty@mashka.mysql.fi <> | 2003-03-07 01:20:56 +0200 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-03-07 01:20:56 +0200 |
commit | d56e2acf50715327e66045366da46e5fe2ddda09 (patch) | |
tree | 473a02ad21d3dcb150966988c72ab2d2a3dd7601 /client | |
parent | 13de61cc3a3feebbca41553e62bbfb34acc7ad27 (diff) | |
parent | c6432989841e029b10e40b64f847264ee0784567 (diff) | |
download | mariadb-git-d56e2acf50715327e66045366da46e5fe2ddda09.tar.gz |
Merge to get fix for LOCK TABLES + DROP TABLE in another thread
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqlbinlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 4cf86eb31c7..1fe3dc86b35 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -27,7 +27,7 @@ #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES) char server_version[SERVER_VERSION_LENGTH]; -uint32 server_id = 0; +ulong server_id = 0; // needed by net_serv.c ulong bytes_sent = 0L, bytes_received = 0L; |