mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
ab7afc8c36
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
21 lines
641 B
C
21 lines
641 B
C
/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
|
|
This file is public domain and comes with NO WARRANTY of any kind */
|
|
|
|
/* Version numbers for protocol & mysqld */
|
|
|
|
#ifdef _CUSTOMCONFIG_
|
|
#include <custom_conf.h>
|
|
#else
|
|
#define PROTOCOL_VERSION @PROTOCOL_VERSION@
|
|
#define MYSQL_SERVER_VERSION "@VERSION@"
|
|
#define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@"
|
|
#define FRM_VER @DOT_FRM_VERSION@
|
|
#define MYSQL_VERSION_ID @MYSQL_VERSION_ID@
|
|
#define MYSQL_PORT @MYSQL_TCP_PORT@
|
|
#define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@"
|
|
|
|
/* mysqld compile time options */
|
|
#ifndef MYSQL_CHARSET
|
|
#define MYSQL_CHARSET "@default_charset@"
|
|
#endif
|
|
#endif
|