mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
This commit is contained in:
commit
ff4839a914
9 changed files with 16 additions and 1 deletions
|
@ -389,6 +389,14 @@ then
|
||||||
AC_MSG_ERROR([MySQL requiers a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
|
AC_MSG_ERROR([MySQL requiers a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_ARG_WITH(server-suffix,
|
||||||
|
[ --with-server-suffix Append value to the version string.],
|
||||||
|
# I heard that 'cut' isn't portable. Isn't there a better way?
|
||||||
|
[ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ],
|
||||||
|
[ MYSQL_SERVER_SUFFIX= ]
|
||||||
|
)
|
||||||
|
AC_SUBST(MYSQL_SERVER_SUFFIX)
|
||||||
|
|
||||||
# Set flags if we wants to have MIT threads.
|
# Set flags if we wants to have MIT threads.
|
||||||
AC_ARG_WITH(mit-threads,
|
AC_ARG_WITH(mit-threads,
|
||||||
[ --with-mit-threads Always use included thread lib.],
|
[ --with-mit-threads Always use included thread lib.],
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#else
|
#else
|
||||||
#define PROTOCOL_VERSION @PROTOCOL_VERSION@
|
#define PROTOCOL_VERSION @PROTOCOL_VERSION@
|
||||||
#define MYSQL_SERVER_VERSION "@VERSION@"
|
#define MYSQL_SERVER_VERSION "@VERSION@"
|
||||||
|
#define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@"
|
||||||
#define FRM_VER @DOT_FRM_VERSION@
|
#define FRM_VER @DOT_FRM_VERSION@
|
||||||
#define MYSQL_VERSION_ID @MYSQL_VERSION_ID@
|
#define MYSQL_VERSION_ID @MYSQL_VERSION_ID@
|
||||||
#define MYSQL_PORT @MYSQL_TCP_PORT@
|
#define MYSQL_PORT @MYSQL_TCP_PORT@
|
||||||
|
|
|
@ -83,6 +83,7 @@ SUFFIXES = .sh
|
||||||
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
||||||
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
||||||
-e 's!@''VERSION''@!@VERSION@!' \
|
-e 's!@''VERSION''@!@VERSION@!' \
|
||||||
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
||||||
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
||||||
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
||||||
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
||||||
|
|
|
@ -62,6 +62,7 @@ SUFFIXES = .sh
|
||||||
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
||||||
-e 's!@''PERL''@!@PERL@!' \
|
-e 's!@''PERL''@!@PERL@!' \
|
||||||
-e 's!@''VERSION''@!@VERSION@!' \
|
-e 's!@''VERSION''@!@VERSION@!' \
|
||||||
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
||||||
$< > $@-t
|
$< > $@-t
|
||||||
@CHMOD@ +x $@-t
|
@CHMOD@ +x $@-t
|
||||||
@MV@ $@-t $@
|
@MV@ $@-t $@
|
||||||
|
|
|
@ -96,6 +96,7 @@ SUFFIXES = .sh
|
||||||
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
||||||
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
||||||
-e 's!@''VERSION''@!@VERSION@!' \
|
-e 's!@''VERSION''@!@VERSION@!' \
|
||||||
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
||||||
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
||||||
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
||||||
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
echo "Finding system information for a MySQL bug report"
|
echo "Finding system information for a MySQL bug report"
|
||||||
|
|
||||||
VERSION="@VERSION@"
|
VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
|
||||||
COMPILATION_COMMENT="@COMPILATION_COMMENT@"
|
COMPILATION_COMMENT="@COMPILATION_COMMENT@"
|
||||||
BUGmysql="mysql@lists.mysql.com"
|
BUGmysql="mysql@lists.mysql.com"
|
||||||
# This is set by configure
|
# This is set by configure
|
||||||
|
|
|
@ -78,6 +78,7 @@ SUFFIXES = .sh
|
||||||
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
||||||
-e 's!@''PERL''@!@PERL@!' \
|
-e 's!@''PERL''@!@PERL@!' \
|
||||||
-e 's!@''VERSION''@!@VERSION@!' \
|
-e 's!@''VERSION''@!@VERSION@!' \
|
||||||
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
||||||
$< > $@-t
|
$< > $@-t
|
||||||
@CHMOD@ +x $@-t
|
@CHMOD@ +x $@-t
|
||||||
@MV@ $@-t $@
|
@MV@ $@-t $@
|
||||||
|
|
|
@ -1471,6 +1471,7 @@ int main(int argc, char **argv)
|
||||||
strmov(glob_hostname,"mysql");
|
strmov(glob_hostname,"mysql");
|
||||||
strmov(pidfile_name,glob_hostname);
|
strmov(pidfile_name,glob_hostname);
|
||||||
strmov(strcend(pidfile_name,'.'),".pid"); // Add extension
|
strmov(strcend(pidfile_name,'.'),".pid"); // Add extension
|
||||||
|
strcat(server_version, MYSQL_SERVER_SUFFIX);
|
||||||
#ifdef DEMO_VERSION
|
#ifdef DEMO_VERSION
|
||||||
strcat(server_version,"-demo");
|
strcat(server_version,"-demo");
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -71,6 +71,7 @@ SUFFIXES = .sh
|
||||||
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
||||||
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
||||||
-e 's!@''VERSION''@!@VERSION@!' \
|
-e 's!@''VERSION''@!@VERSION@!' \
|
||||||
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
||||||
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
||||||
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
||||||
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
||||||
|
|
Loading…
Add table
Reference in a new issue