diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-03-07 01:20:56 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-03-07 01:20:56 +0200 |
| commit | 81f368cc549ebd0078ef64b61bd92332edb5d319 (patch) | |
| tree | 473a02ad21d3dcb150966988c72ab2d2a3dd7601 /client/mysqlbinlog.cc | |
| parent | 7ae420a4a17fab1b45ee56dc5cac2f8d9063baa5 (diff) | |
| parent | 5861dc5b8b39b3f822a8968963a4783541d59b77 (diff) | |
| download | mariadb-git-81f368cc549ebd0078ef64b61bd92332edb5d319.tar.gz | |
Merge to get fix for LOCK TABLES + DROP TABLE in another thread
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-delete.result:
Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/delete.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/type_datetime.result:
Update results after merge
sql/log_event.h:
Use local version
sql/mysql_priv.h:
Use local version
sql/mysqld.cc:
Use local version
sql/sql_repl.h:
Use local version
Diffstat (limited to 'client/mysqlbinlog.cc')
| -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; |