[csw-devel] SF.net SVN: gar:[15873] csw/mgar/pkg/mysql5/branches/mysql-5.0.x
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Thu Oct 6 00:32:13 CEST 2011
Revision: 15873
http://gar.svn.sourceforge.net/gar/?rev=15873&view=rev
Author: wahwah
Date: 2011-10-05 22:32:13 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: mysql_install_db versioned files
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
Added Paths:
-----------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 17:41:13 UTC (rev 15872)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-10-05 22:32:13 UTC (rev 15873)
@@ -134,6 +134,8 @@
# Perhaps using sed would be better, but we have a patch for now.
PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch
PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch
+PATCHFILES += 0008-versioned-mysqld-in-mysql_install_db.patch
+PATCHFILES += 0009-versioned-datadir-in-mysql_install_db-$(BASE_VERSION).patch
# Enable 64 bits build
BUILD64 = 1
Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0008-versioned-mysqld-in-mysql_install_db.patch 2011-10-05 22:32:13 UTC (rev 15873)
@@ -0,0 +1,100 @@
+From a2fe1a2ed1f7488f2638478024e2829c84eded58 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 6 Oct 2011 00:27:23 +0200
+Subject: [PATCH 1/2] versioned mysqld in mysql_install_db
+
+---
+ scripts/mysql_install_db.sh | 24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+index bc887c8..cca6244 100644
+--- a/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
+@@ -16,7 +16,7 @@
+
+ # This scripts creates the MySQL Server system tables
+ #
+-# All unrecognized arguments to this script are passed to mysqld.
++# All unrecognized arguments to this script are passed to mysqld-5.0.
+
+ basedir=""
+ ldata=""
+@@ -53,13 +53,13 @@ Usage: $0 [OPTIONS]
+ mysql_install_db looks for support files such as the
+ error message file and the file for popoulating the
+ help tables.
+- --user=user_name The login username to use for running mysqld. Files
+- and directories created by mysqld will be owned by this
++ --user=user_name The login username to use for running mysqld-5.0. Files
++ and directories created by mysqld-5.0 will be owned by this
+ user. You must be root to use this option. By default
+- mysqld runs using your current login name and files and
++ mysqld-5.0 runs using your current login name and files and
+ directories that it creates will be owned by you.
+
+-All other options are passed to the mysqld program
++All other options are passed to the mysqld-5.0 program
+
+ EOF
+ exit 1
+@@ -98,7 +98,7 @@ parse_arguments()
+ --srcdir=*) srcdir=`parse_arg "$arg"` ;;
+ --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;;
+ --user=*)
+- # Note that the user will be passed to mysqld so that it runs
++ # Note that the user will be passed to mysqld-5.0 so that it runs
+ # as 'user' (crucial e.g. if log-bin=/some_other_path/
+ # where a chown of datadir won't help)
+ user=`parse_arg "$arg"` ;;
+@@ -181,7 +181,7 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@"
+ # location or in the installed area.
+ if test -n "$basedir"
+ then
+- print_defaults=`find_in_basedir my_print_defaults bin extra`
++ print_defaults=`find_in_basedir my_print_defaults-5.0 bin extra`
+ if test ! -x "$print_defaults"
+ then
+ missing_in_basedir my_print_defaults
+@@ -200,9 +200,9 @@ else
+ fi
+ fi
+
+-# Now we can get arguments from the groups [mysqld] and [mysql_install_db]
++# Now we can get arguments from the groups [mysqld-5.0] and [mysql_install_db]
+ # in the my.cfg file, then re-run to merge with command line arguments.
+-parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
++parse_arguments `$print_defaults $defaults mysqld-5.0 mysql_install_db`
+ parse_arguments PICK-ARGS-FROM-ARGV "$@"
+
+ # Path to MySQL installation directory
+@@ -210,7 +210,7 @@ if test -z "$basedir"
+ then
+ basedir="@prefix@"
+ bindir="@bindir@"
+- mysqld="@libexecdir@/mysqld"
++ mysqld="@libexecdir@/mysqld-5.0"
+ pkgdatadir="@pkgdatadir@"
+ else
+ bindir="$basedir/bin"
+@@ -223,7 +223,7 @@ else
+ missing_in_basedir fill_help_tables.sql
+ exit 1
+ fi
+- mysqld=`find_in_basedir mysqld libexec sbin bin`
++ mysqld=`find_in_basedir mysqld-5.0 libexec sbin bin`
+ if test ! -x "$mysqld"
+ then
+ missing_in_basedir mysqld
+@@ -260,7 +260,7 @@ done
+ # Set up bootstrap-specific paths
+ if test "$cross_bootstrap" -eq 1
+ then
+- mysqld="./sql/mysqld"
++ mysqld="./sql/mysqld-5.0"
+ if test -n "$srcdir" -a -f "$srcdir/sql/share/english/errmsg.sys"
+ then
+ mysqld_opt="--language=$srcdir/sql/share/english"
+--
+1.7.6.1
+
Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch 2011-10-05 22:32:13 UTC (rev 15873)
@@ -0,0 +1,25 @@
+From fdd0d9cafc923f2a4eab29f8a1a1f3b76867dbae Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 6 Oct 2011 00:27:44 +0200
+Subject: [PATCH 2/2] versioned datadir in mysql_install_db 5.0
+
+---
+ scripts/mysql_install_db.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+index cca6244..1cdaa0d 100644
+--- a/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
+@@ -217,7 +217,7 @@ else
+ # We set up bootstrap-specific paths later, so skip this for now
+ if test "$cross_bootstrap" -eq 0
+ then
+- pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
++ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mysql/5.1/mysql`
+ if test -z "$pkgdatadir"
+ then
+ missing_in_basedir fill_help_tables.sql
+--
+1.7.6.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list