mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather copied mtr from 6.0-main here (at least this one knows how to run Maria tests). I also fixed suite/maria tests to be accepted by the new mtr. mysys/thr_mutex.c: adding DBUG_PRINT here, so that we can locate where the warning is issued.
This commit is contained in:
Guilhem Bichot
@ -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
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -15,7 +15,11 @@
|
||||
# MA 02110-1301 USA.
|
||||
|
||||
%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)
|
||||
# to enable static linking (off by default)
|
||||
@ -43,7 +47,7 @@
|
||||
%define release 0.glibc23
|
||||
%endif
|
||||
%define license GPL
|
||||
%define mysqld_user mysql
|
||||
%define mysqld_user mysql
|
||||
%define mysqld_group mysql
|
||||
%define server_suffix -standard
|
||||
%define mysqldatadir /var/lib/mysql
|
||||
@ -76,10 +80,10 @@ Summary: MySQL: a very fast and reliable SQL database server
|
||||
Group: Applications/Databases
|
||||
Version: @MYSQL_NO_DASH_VERSION@
|
||||
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
|
||||
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}
|
||||
Provides: msqlormysql MySQL-server mysql
|
||||
BuildRequires: ncurses-devel
|
||||
@ -95,9 +99,11 @@ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
|
||||
and robust SQL (Structured Query Language) database server. MySQL Server
|
||||
is intended for mission-critical, heavy-load production systems as well
|
||||
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,
|
||||
and you are welcome to modify and redistribute it under the GPL license.
|
||||
|
||||
@ -117,9 +123,11 @@ The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
|
||||
and robust SQL (Structured Query Language) database server. MySQL Server
|
||||
is intended for mission-critical, heavy-load production systems as well
|
||||
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,
|
||||
and you are welcome to modify and redistribute it under the GPL license.
|
||||
|
||||
@ -289,7 +297,11 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
||||
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
||||
--with-pic \
|
||||
--prefix=/ \
|
||||
%if %{CLUSTER_BUILD}
|
||||
--with-extra-charsets=all \
|
||||
%else
|
||||
--with-extra-charsets=complex \
|
||||
%endif
|
||||
%if %{YASSL_BUILD}
|
||||
--with-ssl \
|
||||
%endif
|
||||
@ -304,7 +316,20 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
||||
--mandir=%{_mandir} \
|
||||
--enable-thread-safe-client \
|
||||
--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
|
||||
}
|
||||
|
||||
@ -331,6 +356,8 @@ mkdir -p $RBR%{_libdir}/mysql
|
||||
PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin}
|
||||
export PATH
|
||||
|
||||
# Build the Debug binary.
|
||||
|
||||
# Use gcc for C and C++ code (to avoid a dependency on libstdc++ and
|
||||
# including exceptions into the code
|
||||
if [ -z "$CXX" -a -z "$CC" ]
|
||||
@ -351,19 +378,23 @@ 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.
|
||||
CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'`
|
||||
CFLAGS=`echo " $CFLAGS " | \
|
||||
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.
|
||||
cd mysql-debug-%{mysql_version} &&
|
||||
CFLAGS=\"$CFLAGS\" \
|
||||
CXXFLAGS=\"$CXXFLAGS\" \
|
||||
BuildMySQL "--enable-shared \
|
||||
CFLAGS="$CFLAGS" \
|
||||
CXXFLAGS="$CXXFLAGS" \
|
||||
BuildMySQL "\
|
||||
--with-debug \
|
||||
%if %{MARIA_BUILD}
|
||||
--with-comment=\"MySQL Community Server - Debug [Maria] (GPL)\" \
|
||||
--with-comment=\"MySQL Community Server - Debug [Maria] (%{license})\" \
|
||||
%else
|
||||
--with-comment=\"MySQL Community Server - Debug (GPL)\" \
|
||||
--with-comment=\"MySQL Community Server - Debug (%{license})\" \
|
||||
%endif
|
||||
")
|
||||
|
||||
@ -382,14 +413,14 @@ fi
|
||||
##############################################################################
|
||||
|
||||
(cd mysql-release-%{mysql_version} &&
|
||||
CFLAGS=\"$CFLAGS\" \
|
||||
CXXFLAGS=\"$CXXFLAGS\" \
|
||||
BuildMySQL "--enable-shared \
|
||||
CFLAGS="$CFLAGS" \
|
||||
CXXFLAGS="$CXXFLAGS" \
|
||||
BuildMySQL "\
|
||||
--with-embedded-server \
|
||||
%if %{MARIA_BUILD}
|
||||
--with-comment=\"MySQL Community Server [Maria] (GPL)\" \
|
||||
--with-comment=\"MySQL Community Server [Maria] (%{license})\" \
|
||||
%else
|
||||
--with-comment=\"MySQL Community Server (GPL)\" \
|
||||
--with-comment=\"MySQL Community Server (%{license})\" \
|
||||
%endif
|
||||
")
|
||||
# We might want to save the config log file
|
||||
@ -471,6 +502,7 @@ installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
|
||||
if [ $? -eq 0 -a -n "$installed" ]; then
|
||||
vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
|
||||
version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
|
||||
myoldvendor='%{mysql_old_vendor}'
|
||||
myvendor='%{mysql_vendor}'
|
||||
myversion='%{mysql_version}'
|
||||
|
||||
@ -482,12 +514,12 @@ if [ $? -eq 0 -a -n "$installed" ]; then
|
||||
[ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
|
||||
|
||||
error_text=
|
||||
if [ "$vendor" != "$myvendor" ]; then
|
||||
if [ "$vendor" != "$myoldvendor" -a "$vendor" != "$myvendor" ]; then
|
||||
error_text="$error_text
|
||||
The current MySQL server package is provided by a different
|
||||
vendor ($vendor) than $myvendor. Some files may be installed
|
||||
to different locations, including log files and the service
|
||||
startup script in %{_sysconfdir}/init.d/.
|
||||
vendor ($vendor) than $myoldvendor or $myvendor.
|
||||
Some files may be installed to different locations, including log
|
||||
files and the service startup script in %{_sysconfdir}/init.d/.
|
||||
"
|
||||
fi
|
||||
|
||||
@ -711,7 +743,6 @@ fi
|
||||
%attr(755, root, root) %{_bindir}/msql2mysql
|
||||
%attr(755, root, root) %{_bindir}/mysql
|
||||
%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}/mysqlaccess
|
||||
%attr(755, root, root) %{_bindir}/mysqladmin
|
||||
@ -851,6 +882,16 @@ fi
|
||||
# itself - note that they must be ordered by date (important when
|
||||
# merging BK trees)
|
||||
%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>
|
||||
|
||||
- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
|
||||
|
||||
Reference in New Issue
Block a user