database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

bzr merge from guilhem's maria tree to our local 5.1

Browse Source 
configure.in:
  Manually merged
mysql-test/lib/My/ConfigFactory.pm:
  Manually merged
mysql-test/mysql-test-run.pl:
  Manually merged
mysql-test/t/information_schema.test:
  Manually merged
sql/handler.cc:
  Manually merged
support-files/mysql.spec.sh:
  Manually merged
This commit is contained in:
Michael Widenius
2009-04-25 12:04:38 +03:00
parent 059b9356a1 4aeeb1d157
commit 210a412522
566 changed files with 31003 additions and 10870 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
support-files/mysql.spec.sh
View File

@ -46,7 +46,7 @@
%else
%define release 0.glibc23
%endif
%define license GPL
%define mysql_license GPL
%define mysqld_user mysql
%define mysqld_group mysql
%define server_suffix -standard
@ -80,7 +80,7 @@ Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
Version: @MYSQL_NO_DASH_VERSION@
Release: %{release}
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.
License: Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Under %{mysql_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: Sun Microsystems, Inc. Product Engineering Team <build@mysql.com>
@ -101,7 +101,7 @@ is intended for mission-critical, heavy-load production systems as well
as for embedding into mass-deployed software. MySQL is a trademark of
Sun Microsystems, Inc.
Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved.
Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
This software comes with ABSOLUTELY NO WARRANTY. This is free software,
@ -125,7 +125,7 @@ is intended for mission-critical, heavy-load production systems as well
as for embedding into mass-deployed software. MySQL is a trademark of
Sun Microsystems, Inc.
Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. All rights reserved.
Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc. All rights reserved.
Use is subject to license terms.
This software comes with ABSOLUTELY NO WARRANTY. This is free software,
@ -392,9 +392,9 @@ CXXFLAGS="$CXXFLAGS" \
BuildMySQL "\
--with-debug \
%if %{MARIA_BUILD}
--with-comment=\"MySQL Community Server - Debug [Maria] (%{license})\" \
--with-comment=\"MySQL Community Server - Debug [Maria] (%{mysql_license})\" \
%else
--with-comment=\"MySQL Community Server - Debug (%{license})\" \
--with-comment=\"MySQL Community Server - Debug (%{mysql_license})\" \
%endif
")
@ -420,7 +420,7 @@ BuildMySQL "\
%if %{MARIA_BUILD}
--with-comment=\"MariaDB, a community SQL server based on the MySQL Server with Maria (GPL)\" \
%else
--with-comment=\"MySQL Community Server (%{license})\" \
--with-comment=\"MySQL Community Server (%{mysql_license})\" \
%endif
")
# We might want to save the config log file