merge: 5.1 -> 5.1-rpl
conflicts: Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl
This commit is contained in:
commit
b2cdc3b6cb
@ -11,16 +11,33 @@ test -f Makefile && make maintainer-clean
|
|||||||
path=`dirname $0`
|
path=`dirname $0`
|
||||||
. $path/autorun.sh
|
. $path/autorun.sh
|
||||||
|
|
||||||
|
gmake=
|
||||||
|
for x in gmake gnumake make; do
|
||||||
|
if $x --version 2>/dev/null | grep GNU > /dev/null; then
|
||||||
|
gmake=$x
|
||||||
|
break;
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -z "$gmake" ]; then
|
||||||
|
# Our build may not depend on GNU make, but I wouldn't count on it
|
||||||
|
echo "Please install GNU make, and ensure it is in your path as gnumake, gmake, or make" >&2
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
# Default to gcc for CC and CXX
|
# Default to gcc for CC and CXX
|
||||||
if test -z "$CXX" ; then
|
if test -z "$CXX" ; then
|
||||||
|
export CXX
|
||||||
CXX=gcc
|
CXX=gcc
|
||||||
# Set some required compile options
|
# Set some required compile options
|
||||||
if test -z "$CXXFLAGS" ; then
|
if test -z "$CXXFLAGS" ; then
|
||||||
|
export CXXFLAGS
|
||||||
CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
|
CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$CC" ; then
|
if test -z "$CC" ; then
|
||||||
|
export CC
|
||||||
CC=gcc
|
CC=gcc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -28,36 +45,22 @@ fi
|
|||||||
# Use ccache, if available
|
# Use ccache, if available
|
||||||
if ccache -V > /dev/null 2>&1
|
if ccache -V > /dev/null 2>&1
|
||||||
then
|
then
|
||||||
if echo "$CC" | grep "ccache" > /dev/null
|
if echo "$CC" | grep -v ccache > /dev/null
|
||||||
then
|
then
|
||||||
:
|
export CC
|
||||||
else
|
|
||||||
CC="ccache $CC"
|
CC="ccache $CC"
|
||||||
fi
|
fi
|
||||||
if echo "$CXX" | grep "ccache" > /dev/null
|
if echo "$CXX" | grep -v ccache > /dev/null
|
||||||
then
|
then
|
||||||
:
|
export CXX
|
||||||
else
|
|
||||||
CXX="ccache $CXX"
|
CXX="ccache $CXX"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$MAKE"
|
|
||||||
then
|
|
||||||
if gmake -v > /dev/null 2>&1
|
|
||||||
then
|
|
||||||
MAKE="gmake"
|
|
||||||
else
|
|
||||||
MAKE="make"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
export CC CXX MAKE
|
|
||||||
|
|
||||||
# Make sure to enable all features that affect "make dist"
|
# Make sure to enable all features that affect "make dist"
|
||||||
# Remember that configure restricts the man pages to the configured features !
|
# Remember that configure restricts the man pages to the configured features !
|
||||||
./configure \
|
./configure \
|
||||||
--with-embedded-server \
|
--with-embedded-server \
|
||||||
--with-ndbcluster
|
--with-ndbcluster
|
||||||
$MAKE
|
$gmake
|
||||||
|
|
||||||
|
23
Makefile.am
23
Makefile.am
@ -1,4 +1,4 @@
|
|||||||
# Copyright (C) 2000-2006 MySQL AB
|
# Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -163,6 +163,8 @@ test-bt:
|
|||||||
@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
|
@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
|
||||||
-cd mysql-test ; MTR_BUILD_THREAD=auto \
|
-cd mysql-test ; MTR_BUILD_THREAD=auto \
|
||||||
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
|
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
|
||||||
|
-cd mysql-test ; MTR_BUILD_THREAD=auto \
|
||||||
|
@PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
|
||||||
-if [ -d mysql-test/suite/nist ] ; then \
|
-if [ -d mysql-test/suite/nist ] ; then \
|
||||||
cd mysql-test ; MTR_BUILD_THREAD=auto \
|
cd mysql-test ; MTR_BUILD_THREAD=auto \
|
||||||
@PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
|
@PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
|
||||||
@ -179,15 +181,28 @@ test-bt:
|
|||||||
echo "no program found for 'embedded' tests - skipped testing" ; \
|
echo "no program found for 'embedded' tests - skipped testing" ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Re-enable the "jp" suite when bug#28563 is fixed
|
test-bt-fast:
|
||||||
# -cd mysql-test ; MTR_BUILD_THREAD=auto \
|
-cd mysql-test ; MTR_BUILD_THREAD=auto \
|
||||||
# @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
|
@PERL@ ./mysql-test-run.pl --comment=ps --force --timer \
|
||||||
|
--skip-ndbcluster --ps-protocol --report-features
|
||||||
|
-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
|
||||||
|
cd mysql-test ; \
|
||||||
|
MTR_BUILD_THREAD=auto \
|
||||||
|
@PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
|
||||||
|
--with-ndbcluster-only ; \
|
||||||
|
else \
|
||||||
|
echo "no program found for 'ndbcluster' tests - skipped testing" ; \
|
||||||
|
fi
|
||||||
|
-cd mysql-test ; MTR_BUILD_THREAD=auto \
|
||||||
|
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
|
||||||
|
|
||||||
test-bt-debug:
|
test-bt-debug:
|
||||||
-cd mysql-test ; MTR_BUILD_THREAD=auto \
|
-cd mysql-test ; MTR_BUILD_THREAD=auto \
|
||||||
@PERL@ ./mysql-test-run.pl --comment=debug --force --timer \
|
@PERL@ ./mysql-test-run.pl --comment=debug --force --timer \
|
||||||
--skip-ndbcluster --skip-rpl --report-features
|
--skip-ndbcluster --skip-rpl --report-features
|
||||||
|
|
||||||
|
test-bt-debug-fast:
|
||||||
|
|
||||||
# Keep these for a while
|
# Keep these for a while
|
||||||
test-pl: test
|
test-pl: test
|
||||||
test-full-pl: test-full
|
test-full-pl: test-full
|
||||||
|
@ -1535,7 +1535,7 @@ static void usage(int version)
|
|||||||
if (version)
|
if (version)
|
||||||
return;
|
return;
|
||||||
printf("\
|
printf("\
|
||||||
Copyright (C) 2000-2008 MySQL AB\n\
|
Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n\
|
||||||
This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
|
This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
|
||||||
and you are welcome to modify and redistribute it under the GPL license\n");
|
and you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
printf("Usage: %s [OPTIONS] [database]\n", my_progname);
|
printf("Usage: %s [OPTIONS] [database]\n", my_progname);
|
||||||
|
@ -612,7 +612,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
|
|||||||
case ADMIN_VER:
|
case ADMIN_VER:
|
||||||
new_line=1;
|
new_line=1;
|
||||||
print_version();
|
print_version();
|
||||||
puts("Copyright (C) 2000-2006 MySQL AB");
|
puts("Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
|
||||||
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
|
printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
|
||||||
printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
|
printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
|
||||||
@ -983,7 +983,7 @@ static void print_version(void)
|
|||||||
static void usage(void)
|
static void usage(void)
|
||||||
{
|
{
|
||||||
print_version();
|
print_version();
|
||||||
puts("Copyright (C) 2000-2006 MySQL AB");
|
puts("Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
|
||||||
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
puts("Administration program for the mysqld daemon.");
|
puts("Administration program for the mysqld daemon.");
|
||||||
printf("Usage: %s [OPTIONS] command command....\n", my_progname);
|
printf("Usage: %s [OPTIONS] command command....\n", my_progname);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -193,7 +193,7 @@ static void print_version(void)
|
|||||||
static void usage(void)
|
static void usage(void)
|
||||||
{
|
{
|
||||||
print_version();
|
print_version();
|
||||||
puts("Copyright (C) 2000-2006 MySQL AB");
|
puts("Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
|
||||||
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
printf("\
|
printf("\
|
||||||
Loads tables from text files in various formats. The base name of the\n\
|
Loads tables from text files in various formats. The base name of the\n\
|
||||||
|
@ -249,7 +249,7 @@ static void print_version(void)
|
|||||||
static void usage(void)
|
static void usage(void)
|
||||||
{
|
{
|
||||||
print_version();
|
print_version();
|
||||||
puts("Copyright (C) 2000-2006 MySQL AB");
|
puts("Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
|
||||||
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
puts("Shows the structure of a mysql database (databases,tables and columns)\n");
|
puts("Shows the structure of a mysql database (databases,tables and columns)\n");
|
||||||
printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
|
printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
|
||||||
|
@ -688,9 +688,7 @@ static void usage(void)
|
|||||||
{
|
{
|
||||||
print_version();
|
print_version();
|
||||||
puts("Copyright (C) 2005 MySQL AB");
|
puts("Copyright (C) 2005 MySQL AB");
|
||||||
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
\nand you are welcome to modify and redistribute it under the GPL \
|
|
||||||
license\n");
|
|
||||||
puts("Run a query multiple times against the server\n");
|
puts("Run a query multiple times against the server\n");
|
||||||
printf("Usage: %s [OPTIONS]\n",my_progname);
|
printf("Usage: %s [OPTIONS]\n",my_progname);
|
||||||
print_defaults("my",load_default_groups);
|
print_defaults("my",load_default_groups);
|
||||||
|
@ -280,7 +280,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# libndbclient versioning when linked with GNU ld.
|
# libndbclient versioning when linked with GNU ld.
|
||||||
if $LD --version 2>/dev/null|grep -q GNU; then
|
if $LD --version 2>/dev/null|grep GNU >/dev/null 2>&1 ; then
|
||||||
NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"
|
NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"
|
||||||
AC_CONFIG_FILES(storage/ndb/src/libndb.ver)
|
AC_CONFIG_FILES(storage/ndb/src/libndb.ver)
|
||||||
fi
|
fi
|
||||||
|
@ -377,7 +377,7 @@ fi
|
|||||||
MYSQL_PROG_AR
|
MYSQL_PROG_AR
|
||||||
|
|
||||||
# libmysqlclient versioning when linked with GNU ld.
|
# libmysqlclient versioning when linked with GNU ld.
|
||||||
if $LD --version 2>/dev/null|grep -q GNU; then
|
if $LD --version 2>/dev/null| grep GNU >/dev/null 2>&1; then
|
||||||
LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
|
LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
|
||||||
AC_CONFIG_FILES(libmysql/libmysql.ver)
|
AC_CONFIG_FILES(libmysql/libmysql.ver)
|
||||||
fi
|
fi
|
||||||
@ -449,11 +449,11 @@ AC_SUBST(PERL5)
|
|||||||
|
|
||||||
# Enable the abi_check rule only if gcc is available
|
# Enable the abi_check rule only if gcc is available
|
||||||
|
|
||||||
if expr "$CC" : ".*gcc.*"
|
if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
|
||||||
then
|
then
|
||||||
ABI_CHECK="abi_check"
|
|
||||||
else
|
|
||||||
ABI_CHECK=""
|
ABI_CHECK=""
|
||||||
|
else
|
||||||
|
ABI_CHECK="abi_check"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(ABI_CHECK)
|
AC_SUBST(ABI_CHECK)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@ -371,6 +371,9 @@ inline double ulonglong2double(ulonglong value)
|
|||||||
#define HAVE_OPENSSL 1
|
#define HAVE_OPENSSL 1
|
||||||
#define HAVE_YASSL 1
|
#define HAVE_YASSL 1
|
||||||
|
|
||||||
|
#define COMMUNITY_SERVER 1
|
||||||
|
#define ENABLED_PROFILING 1
|
||||||
|
|
||||||
/* Define charsets you want */
|
/* Define charsets you want */
|
||||||
/* #undef HAVE_CHARSET_armscii8 */
|
/* #undef HAVE_CHARSET_armscii8 */
|
||||||
/* #undef HAVE_CHARSET_ascii */
|
/* #undef HAVE_CHARSET_ascii */
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# -*- cperl -*-
|
# -*- cperl -*-
|
||||||
# Copyright (C) 2004-2006 MySQL AB, 2008 Sun Microsystems, Inc.
|
# Copyright 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1463,12 +1463,12 @@ sub executable_setup () {
|
|||||||
{
|
{
|
||||||
$exe_ndbd=
|
$exe_ndbd=
|
||||||
my_find_bin($basedir,
|
my_find_bin($basedir,
|
||||||
["storage/ndb/src/kernel", "libexec", "bin"],
|
["storage/ndb/src/kernel", "libexec", "sbin", "bin"],
|
||||||
"ndbd");
|
"ndbd");
|
||||||
|
|
||||||
$exe_ndb_mgmd=
|
$exe_ndb_mgmd=
|
||||||
my_find_bin($basedir,
|
my_find_bin($basedir,
|
||||||
["storage/ndb/src/mgmsrv", "libexec", "bin"],
|
["storage/ndb/src/mgmsrv", "libexec", "sbin", "bin"],
|
||||||
"ndb_mgmd");
|
"ndb_mgmd");
|
||||||
|
|
||||||
$exe_ndb_waiter=
|
$exe_ndb_waiter=
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2004-2006 MySQL AB
|
/* Copyright 2004-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -451,7 +451,7 @@ int main(int argc,char **argv)
|
|||||||
printf("/*\n\n Do " "not " "edit " "this " "file " "directly!\n\n*/\n");
|
printf("/*\n\n Do " "not " "edit " "this " "file " "directly!\n\n*/\n");
|
||||||
|
|
||||||
printf("\
|
printf("\
|
||||||
/* Copyright (C) 2001-2004 MySQL AB\n\
|
/* Copyright 2001-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n\
|
||||||
\n\
|
\n\
|
||||||
This program is free software; you can redistribute it and/or modify\n\
|
This program is free software; you can redistribute it and/or modify\n\
|
||||||
it under the terms of the GNU General Public License as published by\n\
|
it under the terms of the GNU General Public License as published by\n\
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2005 MySQL AB
|
/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2005 MySQL AB
|
/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2004 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2006 MySQL AB
|
/* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2002 MySQL AB
|
/* Copyright 2002-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2005, 2006 MySQL AB
|
/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2004 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2006 MySQL AB
|
/* Copyright 2006-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2004 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2003 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2000-2006 MySQL AB
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -374,10 +374,8 @@ static struct my_option my_long_options[] =
|
|||||||
static void usage(void)
|
static void usage(void)
|
||||||
{
|
{
|
||||||
print_version();
|
print_version();
|
||||||
puts("Copyright (C) 2007 MySQL AB");
|
puts("Copyright 2007-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
|
||||||
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
\nand you are welcome to modify and redistribute it under the GPL \
|
|
||||||
license\n");
|
|
||||||
puts("Read and modify Archive files directly\n");
|
puts("Read and modify Archive files directly\n");
|
||||||
printf("Usage: %s [OPTIONS] file_to_be_looked_at [file_for_backup]\n", my_progname);
|
printf("Usage: %s [OPTIONS] file_to_be_looked_at [file_for_backup]\n", my_progname);
|
||||||
print_defaults("my", load_default_groups);
|
print_defaults("my", load_default_groups);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2005 MySQL AB
|
/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2005 MySQL AB
|
/* Copyright 2005-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -300,7 +300,7 @@ static void print_version(void)
|
|||||||
static void usage(void)
|
static void usage(void)
|
||||||
{
|
{
|
||||||
print_version();
|
print_version();
|
||||||
puts("Copyright (C) 2002 MySQL AB");
|
puts("Copyright 2002-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
|
||||||
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,");
|
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,");
|
||||||
puts("and you are welcome to modify and redistribute it under the GPL license\n");
|
puts("and you are welcome to modify and redistribute it under the GPL license\n");
|
||||||
|
|
||||||
|
@ -81,9 +81,9 @@ open (OUTFILE, "> ${destdir}/doxygen.sty.new")
|
|||||||
while (<INFILE>)
|
while (<INFILE>)
|
||||||
{
|
{
|
||||||
if (/\\rfoot/) {
|
if (/\\rfoot/) {
|
||||||
print OUTFILE "\\rfoot[\\fancyplain{}{\\bfseries\\small \\copyright~Copyright 2003-2004 MySQL AB\\hfill support-cluster\@mysql.com}]{}\n";
|
print OUTFILE "\\rfoot[\\fancyplain{}{\\bfseries\\small \\copyright~Copyright 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.\\hfill support-cluster\@mysql.com}]{}\n";
|
||||||
} elsif (/\\lfoot/) {
|
} elsif (/\\lfoot/) {
|
||||||
print OUTFILE "\\lfoot[]{\\fancyplain{}{\\bfseries\\small support-cluster\@mysql.com\\hfill \\copyright~Copyright 2003-2004 MySQL AB}}\n";
|
print OUTFILE "\\lfoot[]{\\fancyplain{}{\\bfseries\\small support-cluster\@mysql.com\\hfill \\copyright~Copyright 2003-2008 MySQL AB, 2008 Sun Microsystems, Inc.}}\n";
|
||||||
} else {
|
} else {
|
||||||
print OUTFILE;
|
print OUTFILE;
|
||||||
}
|
}
|
||||||
|
@ -2,8 +2,7 @@
|
|||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
the Free Software Foundation; version 2 of the License.
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -2,8 +2,7 @@
|
|||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
the Free Software Foundation; version 2 of the License.
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
@ -249,7 +249,7 @@ static void
|
|||||||
fprint_copyright(FILE *file)
|
fprint_copyright(FILE *file)
|
||||||
{
|
{
|
||||||
fprintf(file,
|
fprintf(file,
|
||||||
"/* Copyright (C) 2000-2007 MySQL AB\n"
|
"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n"
|
||||||
"\n"
|
"\n"
|
||||||
" This program is free software; you can redistribute it and/or modify\n"
|
" This program is free software; you can redistribute it and/or modify\n"
|
||||||
" it under the terms of the GNU General Public License as published by\n"
|
" it under the terms of the GNU General Public License as published by\n"
|
||||||
|
@ -34,7 +34,7 @@ sort_buffer_size = 64K
|
|||||||
read_buffer_size = 256K
|
read_buffer_size = 256K
|
||||||
read_rnd_buffer_size = 256K
|
read_rnd_buffer_size = 256K
|
||||||
net_buffer_length = 2K
|
net_buffer_length = 2K
|
||||||
thread_stack = 64K
|
thread_stack = 128K
|
||||||
|
|
||||||
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
|
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
|
||||||
# if all processes that need to connect to mysqld run on the same host.
|
# if all processes that need to connect to mysqld run on the same host.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Copyright (C) 2000-2007 MySQL AB
|
# Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@ -15,7 +15,11 @@
|
|||||||
# MA 02110-1301 USA.
|
# MA 02110-1301 USA.
|
||||||
|
|
||||||
%define mysql_version @VERSION@
|
%define mysql_version @VERSION@
|
||||||
%define mysql_vendor MySQL AB
|
|
||||||
|
# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
|
||||||
|
# change these, has to be exactly as is.
|
||||||
|
%define mysql_old_vendor MySQL AB
|
||||||
|
%define mysql_vendor Sun Microsystems, Inc.
|
||||||
|
|
||||||
# use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
|
# use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
|
||||||
# to enable static linking (off by default)
|
# to enable static linking (off by default)
|
||||||
@ -38,7 +42,7 @@
|
|||||||
%define release 0.glibc23
|
%define release 0.glibc23
|
||||||
%endif
|
%endif
|
||||||
%define license GPL
|
%define license GPL
|
||||||
%define mysqld_user mysql
|
%define mysqld_user mysql
|
||||||
%define mysqld_group mysql
|
%define mysqld_group mysql
|
||||||
%define server_suffix -standard
|
%define server_suffix -standard
|
||||||
%define mysqldatadir /var/lib/mysql
|
%define mysqldatadir /var/lib/mysql
|
||||||
@ -71,10 +75,10 @@ Summary: MySQL: a very fast and reliable SQL database server
|
|||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
Version: @MYSQL_NO_DASH_VERSION@
|
Version: @MYSQL_NO_DASH_VERSION@
|
||||||
Release: %{release}
|
Release: %{release}
|
||||||
License: %{license}
|
License: Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under %{license} license as shown in the Description field.
|
||||||
Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
|
Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
|
||||||
URL: http://www.mysql.com/
|
URL: http://www.mysql.com/
|
||||||
Packager: MySQL Production Engineering Team <build@mysql.com>
|
Packager: Sun Microsystems, Inc. Product Engineering Team <build@mysql.com>
|
||||||
Vendor: %{mysql_vendor}
|
Vendor: %{mysql_vendor}
|
||||||
Provides: msqlormysql MySQL-server mysql
|
Provides: msqlormysql MySQL-server mysql
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -90,9 +94,11 @@ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
|
|||||||
and robust SQL (Structured Query Language) database server. MySQL Server
|
and robust SQL (Structured Query Language) database server. MySQL Server
|
||||||
is intended for mission-critical, heavy-load production systems as well
|
is intended for mission-critical, heavy-load production systems as well
|
||||||
as for embedding into mass-deployed software. MySQL is a trademark of
|
as for embedding into mass-deployed software. MySQL is a trademark of
|
||||||
MySQL AB.
|
Sun Microsystems, Inc.
|
||||||
|
|
||||||
|
Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
Use is subject to license terms.
|
||||||
|
|
||||||
Copyright (C) 2000-2007 MySQL AB
|
|
||||||
This software comes with ABSOLUTELY NO WARRANTY. This is free software,
|
This software comes with ABSOLUTELY NO WARRANTY. This is free software,
|
||||||
and you are welcome to modify and redistribute it under the GPL license.
|
and you are welcome to modify and redistribute it under the GPL license.
|
||||||
|
|
||||||
@ -112,9 +118,11 @@ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
|
|||||||
and robust SQL (Structured Query Language) database server. MySQL Server
|
and robust SQL (Structured Query Language) database server. MySQL Server
|
||||||
is intended for mission-critical, heavy-load production systems as well
|
is intended for mission-critical, heavy-load production systems as well
|
||||||
as for embedding into mass-deployed software. MySQL is a trademark of
|
as for embedding into mass-deployed software. MySQL is a trademark of
|
||||||
MySQL AB.
|
Sun Microsystems, Inc.
|
||||||
|
|
||||||
|
Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
Use is subject to license terms.
|
||||||
|
|
||||||
Copyright (C) 2000-2007 MySQL AB
|
|
||||||
This software comes with ABSOLUTELY NO WARRANTY. This is free software,
|
This software comes with ABSOLUTELY NO WARRANTY. This is free software,
|
||||||
and you are welcome to modify and redistribute it under the GPL license.
|
and you are welcome to modify and redistribute it under the GPL license.
|
||||||
|
|
||||||
@ -264,7 +272,11 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||||||
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
||||||
--with-pic \
|
--with-pic \
|
||||||
--prefix=/ \
|
--prefix=/ \
|
||||||
|
%if %{CLUSTER_BUILD}
|
||||||
--with-extra-charsets=all \
|
--with-extra-charsets=all \
|
||||||
|
%else
|
||||||
|
--with-extra-charsets=complex \
|
||||||
|
%endif
|
||||||
%if %{YASSL_BUILD}
|
%if %{YASSL_BUILD}
|
||||||
--with-ssl \
|
--with-ssl \
|
||||||
%endif
|
%endif
|
||||||
@ -279,7 +291,20 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||||||
--mandir=%{_mandir} \
|
--mandir=%{_mandir} \
|
||||||
--enable-thread-safe-client \
|
--enable-thread-safe-client \
|
||||||
--with-readline \
|
--with-readline \
|
||||||
"
|
--with-innodb \
|
||||||
|
%if %{CLUSTER_BUILD}
|
||||||
|
--with-ndbcluster \
|
||||||
|
%else
|
||||||
|
--without-ndbcluster \
|
||||||
|
%endif
|
||||||
|
--with-archive-storage-engine \
|
||||||
|
--with-csv-storage-engine \
|
||||||
|
--with-blackhole-storage-engine \
|
||||||
|
--with-federated-storage-engine \
|
||||||
|
--with-partition \
|
||||||
|
--with-big-tables \
|
||||||
|
--enable-shared \
|
||||||
|
"
|
||||||
make
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -306,6 +331,8 @@ mkdir -p $RBR%{_libdir}/mysql
|
|||||||
PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin}
|
PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin}
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
|
# Build the Debug binary.
|
||||||
|
|
||||||
# Use gcc for C and C++ code (to avoid a dependency on libstdc++ and
|
# Use gcc for C and C++ code (to avoid a dependency on libstdc++ and
|
||||||
# including exceptions into the code
|
# including exceptions into the code
|
||||||
if [ -z "$CXX" -a -z "$CC" ]
|
if [ -z "$CXX" -a -z "$CC" ]
|
||||||
@ -326,28 +353,20 @@ CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-except
|
|||||||
|
|
||||||
(
|
(
|
||||||
# We are in a subshell, so we can modify variables just for one run.
|
# We are in a subshell, so we can modify variables just for one run.
|
||||||
CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'`
|
CFLAGS=`echo " $CFLAGS " | \
|
||||||
CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'`
|
sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
|
||||||
|
-e 's/^ //' -e 's/ $//'`
|
||||||
|
CXXFLAGS=`echo " $CXXFLAGS " | \
|
||||||
|
sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \
|
||||||
|
-e 's/^ //' -e 's/ $//'`
|
||||||
|
|
||||||
# Add -g and --with-debug.
|
# Add -g and --with-debug.
|
||||||
cd mysql-debug-%{mysql_version} &&
|
cd mysql-debug-%{mysql_version} &&
|
||||||
CFLAGS=\"$CFLAGS\" \
|
CFLAGS="$CFLAGS" \
|
||||||
CXXFLAGS=\"$CXXFLAGS\" \
|
CXXFLAGS="$CXXFLAGS" \
|
||||||
BuildMySQL "--enable-shared \
|
BuildMySQL "\
|
||||||
--with-debug \
|
--with-debug \
|
||||||
--with-innodb \
|
--with-comment=\"MySQL Community Server - Debug (%{license})\"")
|
||||||
%if %{CLUSTER_BUILD}
|
|
||||||
--with-ndbcluster \
|
|
||||||
%else
|
|
||||||
--without-ndbcluster \
|
|
||||||
%endif
|
|
||||||
--with-archive-storage-engine \
|
|
||||||
--with-csv-storage-engine \
|
|
||||||
--with-blackhole-storage-engine \
|
|
||||||
--with-federated-storage-engine \
|
|
||||||
--with-partition \
|
|
||||||
--with-big-tables \
|
|
||||||
--with-comment=\"MySQL Community Server - Debug (GPL)\"")
|
|
||||||
|
|
||||||
# We might want to save the config log file
|
# We might want to save the config log file
|
||||||
if test -n "$MYSQL_DEBUGCONFLOG_DEST"
|
if test -n "$MYSQL_DEBUGCONFLOG_DEST"
|
||||||
@ -364,23 +383,11 @@ fi
|
|||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
(cd mysql-release-%{mysql_version} &&
|
(cd mysql-release-%{mysql_version} &&
|
||||||
CFLAGS=\"$CFLAGS\" \
|
CFLAGS="$CFLAGS" \
|
||||||
CXXFLAGS=\"$CXXFLAGS\" \
|
CXXFLAGS="$CXXFLAGS" \
|
||||||
BuildMySQL "--enable-shared \
|
BuildMySQL "\
|
||||||
--with-innodb \
|
|
||||||
%if %{CLUSTER_BUILD}
|
|
||||||
--with-ndbcluster \
|
|
||||||
%else
|
|
||||||
--without-ndbcluster \
|
|
||||||
%endif
|
|
||||||
--with-archive-storage-engine \
|
|
||||||
--with-csv-storage-engine \
|
|
||||||
--with-blackhole-storage-engine \
|
|
||||||
--with-federated-storage-engine \
|
|
||||||
--with-partition \
|
|
||||||
--with-embedded-server \
|
--with-embedded-server \
|
||||||
--with-big-tables \
|
--with-comment=\"MySQL Community Server (%{license})\"")
|
||||||
--with-comment=\"MySQL Community Server (GPL)\"")
|
|
||||||
# We might want to save the config log file
|
# We might want to save the config log file
|
||||||
if test -n "$MYSQL_CONFLOG_DEST"
|
if test -n "$MYSQL_CONFLOG_DEST"
|
||||||
then
|
then
|
||||||
@ -460,6 +467,7 @@ installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
|
|||||||
if [ $? -eq 0 -a -n "$installed" ]; then
|
if [ $? -eq 0 -a -n "$installed" ]; then
|
||||||
vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
|
vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
|
||||||
version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
|
version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
|
||||||
|
myoldvendor='%{mysql_old_vendor}'
|
||||||
myvendor='%{mysql_vendor}'
|
myvendor='%{mysql_vendor}'
|
||||||
myversion='%{mysql_version}'
|
myversion='%{mysql_version}'
|
||||||
|
|
||||||
@ -471,12 +479,12 @@ if [ $? -eq 0 -a -n "$installed" ]; then
|
|||||||
[ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
|
[ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
|
||||||
|
|
||||||
error_text=
|
error_text=
|
||||||
if [ "$vendor" != "$myvendor" ]; then
|
if [ "$vendor" != "$myoldvendor" -a "$vendor" != "$myvendor" ]; then
|
||||||
error_text="$error_text
|
error_text="$error_text
|
||||||
The current MySQL server package is provided by a different
|
The current MySQL server package is provided by a different
|
||||||
vendor ($vendor) than $myvendor. Some files may be installed
|
vendor ($vendor) than $myoldvendor or $myvendor.
|
||||||
to different locations, including log files and the service
|
Some files may be installed to different locations, including log
|
||||||
startup script in %{_sysconfdir}/init.d/.
|
files and the service startup script in %{_sysconfdir}/init.d/.
|
||||||
"
|
"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -700,7 +708,6 @@ fi
|
|||||||
%attr(755, root, root) %{_bindir}/msql2mysql
|
%attr(755, root, root) %{_bindir}/msql2mysql
|
||||||
%attr(755, root, root) %{_bindir}/mysql
|
%attr(755, root, root) %{_bindir}/mysql
|
||||||
%attr(755, root, root) %{_bindir}/mysql_find_rows
|
%attr(755, root, root) %{_bindir}/mysql_find_rows
|
||||||
%attr(755, root, root) %{_bindir}/mysql_upgrade_shell
|
|
||||||
%attr(755, root, root) %{_bindir}/mysql_waitpid
|
%attr(755, root, root) %{_bindir}/mysql_waitpid
|
||||||
%attr(755, root, root) %{_bindir}/mysqlaccess
|
%attr(755, root, root) %{_bindir}/mysqlaccess
|
||||||
%attr(755, root, root) %{_bindir}/mysqladmin
|
%attr(755, root, root) %{_bindir}/mysqladmin
|
||||||
@ -840,6 +847,16 @@ fi
|
|||||||
# itself - note that they must be ordered by date (important when
|
# itself - note that they must be ordered by date (important when
|
||||||
# merging BK trees)
|
# merging BK trees)
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
|
||||||
|
|
||||||
|
- Correct yesterday's fix, so that it also works for the last flag,
|
||||||
|
and fix a wrong quoting: un-quoted quote marks must not be escaped.
|
||||||
|
|
||||||
|
* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
|
||||||
|
|
||||||
|
- Removed "mysql_upgrade_shell"
|
||||||
|
- Removed some copy/paste between debug and normal build
|
||||||
|
|
||||||
* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
|
* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
|
||||||
|
|
||||||
- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
|
- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user