diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-21 16:30:16 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-21 16:30:16 +0200 |
| commit | ab7afc8c36279051e25d157993281bd9dba4a58a (patch) | |
| tree | c772f489364087df96cf8f0582915a11ba82ae54 /sql/mysqlbinlog.cc | |
| parent | 9223381f9c85297d7548f99e7ea7cd6c157e763a (diff) | |
| download | mariadb-git-ab7afc8c36279051e25d157993281bd9dba4a58a.tar.gz | |
Changes for --with-server-suffix
Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE tables to not use FILE
BitKeeper/deleted/.del-m.MRG~3f5632c37af00f18:
Delete: mysql-test/std_data/m.MRG
BitKeeper/deleted/.del-m.frm~e351dfe0b6824c0c:
Delete: mysql-test/std_data/m.frm
Docs/manual.texi:
Added DNS section
configure.in:
Update to 3.23.32
include/Makefile.am:
Added my_config.h
include/mysql_com.h:
Changes for --with-server-suffix
include/mysql_version.h.in:
cleanup
merge/open.c:
Don't use FILE
mysql-test/Makefile.am:
removed not needed data files
mysql-test/r/merge.result:
generate merge file
mysql-test/t/merge.test:
generate merge file
sql-bench/Results/ATIS-mysql-NT_4.0:
New benchmark results
sql-bench/Results/RUN-mysql-NT_4.0:
New benchmark results
sql-bench/Results/alter-table-mysql-NT_4.0:
New benchmark results
sql-bench/Results/big-tables-mysql-NT_4.0:
New benchmark results
sql-bench/Results/connect-mysql-NT_4.0:
New benchmark results
sql-bench/Results/create-mysql-NT_4.0:
New benchmark results
sql-bench/Results/insert-mysql-NT_4.0:
New benchmark results
sql-bench/Results/select-mysql-NT_4.0:
New benchmark results
sql-bench/Results/wisconsin-mysql-NT_4.0:
New benchmark results
sql/log.cc:
Ensure that mutex are initialized before used
sql/log_event.h:
Changes for --with-server-suffix
sql/mysql_priv.h:
Changes for --with-server-suffix
sql/mysqlbinlog.cc:
Changes for --with-server-suffix
sql/mysqld.cc:
changed strnmov -> strmake
sql/net_pkg.cc:
Prepare for adding char-set conversion to SHOW commands
Diffstat (limited to 'sql/mysqlbinlog.cc')
| -rw-r--r-- | sql/mysqlbinlog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc index 497364ca8a4..b09decf1c86 100644 --- a/sql/mysqlbinlog.cc +++ b/sql/mysqlbinlog.cc @@ -22,14 +22,14 @@ #include <my_sys.h> #include <getopt.h> #include <thr_alarm.h> -#include "log_event.h" #define MYSQL_SERVER // We want the C++ version of net #include <mysql.h> +#include "log_event.h" #include "mini_client.h" #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES) -char server_version[50]; +char server_version[SERVER_VERSION_LENGTH]; uint32 server_id = 0; // needed by net_serv.c |