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 /include | |
| 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 'include')
| -rw-r--r-- | include/Makefile.am | 7 | ||||
| -rw-r--r-- | include/mysql_com.h | 1 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 17d9c95216c..0cd749aea8a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,7 +15,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -BUILT_SOURCES = mysql_version.h m_ctype.h +BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ mysqld_error.h my_list.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \ @@ -43,6 +43,11 @@ all-local: my_global.h my_config.h link_sources: $(CP) ../config.h my_config.h +# Keep automake happy + +my_config.h: ../config.h + $(CP) ../config.h my_config.h + # This should be changed in the source and removed. my_global.h: global.h $(RM) -f my_global.h diff --git a/include/mysql_com.h b/include/mysql_com.h index f7052225dce..f03dc0bf96e 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -26,6 +26,7 @@ #define NAME_LEN 64 /* Field/table name length */ #define HOSTNAME_LENGTH 60 #define USERNAME_LENGTH 16 +#define SERVER_VERSION_LENGTH 60 #define LOCAL_HOST "localhost" #define LOCAL_HOST_NAMEDPIPE "." diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 8a4bff7a284..44fd00f806a 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -1,10 +1,10 @@ -/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB & Detron HB +/* 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> +#include <custom_conf.h> #else #define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define MYSQL_SERVER_VERSION "@VERSION@" |