diff options
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@" |