summaryrefslogtreecommitdiff
path: root/support-files/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'support-files/debian/patches')
-rw-r--r--support-files/debian/patches/ab31
-rw-r--r--support-files/debian/patches/ad53
-rw-r--r--support-files/debian/patches/ae48
-rw-r--r--support-files/debian/patches/ta68
-rw-r--r--support-files/debian/patches/tb86
5 files changed, 192 insertions, 94 deletions
diff --git a/support-files/debian/patches/ab b/support-files/debian/patches/ab
index ed6ca58f729..e169ee38188 100644
--- a/support-files/debian/patches/ab
+++ b/support-files/debian/patches/ab
@@ -1,20 +1,11 @@
---- mysql-3.23.23.orig/scripts/Makefile.in
-+++ mysql-3.23.23/scripts/Makefile.in
-@@ -337,6 +337,7 @@
- @RM@ -f $@ $@-t
- @SED@ \
- -e 's!@''bindir''@!$(bindir)!g' \
-+ -e 's!@''sbindir''@!$(sbindir)!g' \
- -e 's!@''scriptdir''@!$(bindir)!g' \
- -e 's!@''prefix''@!$(prefix)!g' \
- -e 's!@''datadir''@!$(datadir)!g' \
---- mysql-3.23.23.orig/support-files/Makefile.in
-+++ mysql-3.23.23/support-files/Makefile.in
-@@ -308,6 +308,7 @@
- @RM@ -f $@ $@-t
- @SED@ \
- -e 's!@''bindir''@!$(bindir)!g' \
-+ -e 's!@''sbindir''@!$(sbindir)!g' \
- -e 's!@''scriptdir''@!$(bindir)!g' \
- -e 's!@''prefix''@!$(prefix)!g' \
- -e 's!@''datadir''@!$(datadir)!g' \
+--- mysql-3.23.34a/sql/Makefile.in.orig Mon Mar 12 08:27:39 2001
++++ mysql-3.23.34a/sql/Makefile.in Thu Mar 15 04:11:14 2001
+@@ -373,7 +373,7 @@
+
+ mysqlbinlog: $(mysqlbinlog_OBJECTS) $(mysqlbinlog_DEPENDENCIES)
+ @rm -f mysqlbinlog
+- $(CXXLINK) $(mysqlbinlog_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqlbinlog_LDADD) $(LIBS)
++ $(CXXLINK) $(mysqld_LDFLAGS) $(mysqlbinlog_OBJECTS) $(mysqld_LDADD) $(LIBS)
+
+ mysqld: $(mysqld_OBJECTS) $(mysqld_DEPENDENCIES)
+ @rm -f mysqld
diff --git a/support-files/debian/patches/ad b/support-files/debian/patches/ad
index a90cf669ff6..25394116ad9 100644
--- a/support-files/debian/patches/ad
+++ b/support-files/debian/patches/ad
@@ -1,52 +1,11 @@
---- mysql-3.23.23.orig/scripts/mysql_install_db.sh
-+++ mysql-3.23.23/scripts/mysql_install_db.sh
-@@ -11,6 +11,7 @@
- ldata=@localstatedir@
- execdir=@libexecdir@
- bindir=@bindir@
-+sbindir=@sbindir@
- force=0
- IN_RPM=0
- defaults=
-@@ -47,6 +48,10 @@
+--- mysql-3.23.34a/scripts/mysql_install_db.sh.orig Mon Mar 12 08:18:27 2001
++++ mysql-3.23.34a/scripts/mysql_install_db.sh Thu Mar 15 04:12:28 2001
+@@ -325,7 +325,7 @@
+ if test "$IN_RPM" -eq 0
then
- bindir=`grep "^bindir" $conf | sed 's;^[^=]*=[ \t]*;;' | sed 's;[ \t]$;;'`
- fi
-+ if grep "^sbindir" $conf >/dev/null
-+ then
-+ sbindir=`grep "^sbindir" $conf | sed '.*=[ \t]*//`
-+ fi
- if grep "^user" $conf >/dev/null
- then
- user=`grep "^user" $conf | sed 's;^[^=]*=[ \t]*;;' | sed 's;[ \t]$;;'`
-@@ -56,7 +61,7 @@
- for arg
- do
- case "$arg" in
-- --basedir=*) basedir=`echo "$arg"|sed 's;^--basedir=;;'`; bindir="$basedir/bin"; execdir="$basedir/libexec" ;;
-+ --basedir=*) basedir=`echo "$arg"|sed 's;^--basedir=;;'`; bindir="$basedir/bin"; sbindir="$basedir/sbin"; execdir="$basedir/libexec" ;;
- --datadir=*) ldata=`echo "$arg"|sed 's;^--datadir=;;'` ;;
- --user=*) user=`echo "$arg"|sed 's;^--user=;;'` ;;
- esac
-@@ -82,10 +87,10 @@
- # Check if hostname is valid
- if test "$IN_RPM" -eq 0 -a $force -eq 0
- then
-- resolved=`$bindir/resolveip $hostname 2>&1`
-+ resolved=`$bindir/mysql_resolveip $hostname 2>&1`
- if [ $? -ne 0 ]
- then
-- resolved=`$bindir/resolveip localhost 2>&1`
-+ resolved=`$bindir/mysql_resolveip localhost 2>&1`
- if [ $? -eq 0 ]
- then
- echo "Sorry, the host '$hostname' could not be looked up."
-@@ -300,7 +305,7 @@
- if test -z "$IN_RPM"
- then
- echo "You can start the MySQL demon with:"
+ echo "You can start the MySQL daemon with:"
- echo "cd @prefix@ ; $bindir/safe_mysqld &"
+ echo "cd @prefix@ ; $sbindir/safe_mysqld &"
echo
- echo "You can test the MySQL demon with the benchmarks in the 'sql-bench' directory:"
+ echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
echo "cd sql-bench ; run-all-tests"
diff --git a/support-files/debian/patches/ae b/support-files/debian/patches/ae
index d6ccdcfaaf0..7ea5733147f 100644
--- a/support-files/debian/patches/ae
+++ b/support-files/debian/patches/ae
@@ -1,25 +1,17 @@
---- mysql-3.23.23.orig/support-files/mysql.server.sh Tue Sep 5 19:13:35 2000
-+++ mysql-3.23.23/support-files/mysql.server.sh Tue Sep 5 19:19:40 2000
-@@ -16,6 +16,7 @@
- PATH=/sbin:/usr/sbin:/bin:/usr/bin
- basedir=@prefix@
- bindir=@bindir@
-+sbindir=@sbindir@
- datadir=@localstatedir@
- pid_file=@localstatedir@/mysqld.pid
- log_file=@localstatedir@/mysqld.log
-@@ -64,6 +65,10 @@
- then
- bindir=`grep "^bindir" $conf | cut -f 2 -d= | tr -d ' '`
- fi
-+ if grep "^sbindir" $conf >/dev/null
-+ then
-+ sbindir=`grep "^sbindir" $conf | cut -f 2 -d= | tr -d ' '`
-+ fi
- if grep "^log[ \t]*=" $conf >/dev/null
- then
- log_file=`grep "log[ \t]*=" $conf | cut -f 2 -d= | tr -d ' '`
-@@ -78,14 +83,15 @@
+--- mysql-3.23.30-gamma/support-files/mysql.server.sh.orig Thu Jan 4 11:03:57 2001
++++ mysql-3.23.30-gamma/support-files/mysql.server.sh Sat Jan 6 12:18:50 2001
+@@ -28,8 +28,10 @@
+ then
+ basedir=@prefix@
+ bindir=@bindir@
++ sbindir=@sbindir@
+ else
+ bindir="$basedir/bin"
++ sbindir="$basedir/sbin"
+ fi
+ if test -z "$pid_file"
+ then
+@@ -100,18 +102,18 @@
'start')
# Start daemon
@@ -28,11 +20,13 @@
then
# Give extra arguments to mysqld with the my.cnf file. This script may
# be overwritten at next upgrade.
-- $bindir/safe_mysqld \
-- --user=$mysql_daemon_user --datadir=$datadir --pid-file=$pid_file --log=$log_file &
-+ $sbindir/safe_mysqld \
-+ --user=$mysql_daemon_user --datadir=$datadir --pid-file=$pid_file &
-+# --log=$log_file &
+- $bindir/safe_mysqld --datadir=$datadir --pid-file=$pid_file &
++ $sbindir/safe_mysqld --datadir=$datadir --pid-file=$pid_file &
+ # Make lock for RedHat / SuSE
+ if test -w /var/lock/subsys
+ then
+ touch /var/lock/subsys/mysql
+ fi
else
- echo "Can't execute $bindir/safe_mysqld"
+ echo "Can't execute $sbindir/safe_mysqld"
diff --git a/support-files/debian/patches/ta b/support-files/debian/patches/ta
new file mode 100644
index 00000000000..b27259f4473
--- /dev/null
+++ b/support-files/debian/patches/ta
@@ -0,0 +1,68 @@
+--- mysql-3.23.34a/mysql-test/install_test_db.sh.orig Mon Mar 12 08:18:24 2001
++++ mysql-3.23.34a/mysql-test/install_test_db.sh Thu Mar 15 04:11:14 2001
+@@ -5,6 +5,15 @@
+ # This scripts creates the privilege tables db, host, user, tables_priv,
+ # columns_priv in the mysql database, as well as the func table.
+
++if [ x$1 = x"-debian" ]; then
++ DEBIAN=1
++ shift 1
++ execdir=/usr/sbin
++ bindir=/usr/bin
++ BINARY_DIST=1
++ fix_bin=/var/mysql/mysql-test
++else
++
+ if [ x$1 = x"-bin" ]; then
+ shift 1
+ execdir=../bin
+@@ -17,6 +26,10 @@
+ fix_bin=.
+ fi
+
++fi
++
++
++
+ vardir=var
+ logdir=$vardir/log
+ if [ x$1 = x"-slave" ]
+@@ -47,12 +60,17 @@
+ #create the directories
+ [ -d $vardir ] || mkdir $vardir
+ [ -d $logdir ] || mkdir $logdir
++[ "x$RUN_USER" != "x" ] && chown -R $RUN_USER $logdir
+
+ # Create database directories mysql & test
+ if [ -d $data ] ; then rm -rf $data ; fi
+ mkdir $data $data/mysql $data/test
+
+ #for error messages
++if [ "x$DEBIAN" = "x1" ]; then
++ basedir=/usr
++else
++
+ if [ x$BINARY_DIST = x1 ] ; then
+ basedir=..
+ else
+@@ -62,6 +80,10 @@
+ ln -sf ../../sql/share share/mysql
+ fi
+
++fi
++
++
++
+ # Initialize variables
+ c_d="" i_d=""
+ c_h="" i_h=""
+@@ -211,7 +233,9 @@
+ $c_c
+ END_OF_DATA
+ then
++ [ "x$RUN_USER" != "x" ] && chown -R $RUN_USER $ldata
+ exit 0
+ else
++ [ "x$RUN_USER" != "x" ] && chown -R $RUN_USER $ldata
+ exit 1
+ fi
diff --git a/support-files/debian/patches/tb b/support-files/debian/patches/tb
new file mode 100644
index 00000000000..c3890dcab62
--- /dev/null
+++ b/support-files/debian/patches/tb
@@ -0,0 +1,86 @@
+--- mysql-3.23.34a/mysql-test/mysql-test-run.sh.orig Mon Mar 12 08:18:27 2001
++++ mysql-3.23.34a/mysql-test/mysql-test-run.sh Thu Mar 15 04:11:14 2001
+@@ -37,9 +37,23 @@
+ XARGS=`which xargs | head -1`
+ SED=sed
+
++if [ $USER = root ]; then
++ RUN_USER="mysql"
++ RUN_USER_OPT="--user=$RUN_USER"
++ export RUN_USER
++fi
++
++
+ # Are we using a source or a binary distribution?
+
+ testdir=@testdir@
++
++if [ -d /var/mysql/mysql-test ]; then
++ DEBIAN=1
++ cd /var/mysql/mysql-test
++ testdir=/var/mysql
++fi
++
+ if [ -d bin/mysqld ] && [ -d mysql-test ] ; then
+ cd mysql-test
+ else
+@@ -56,6 +70,10 @@
+ exit 1
+ fi
+
++if [ x$DEBIAN = x1 ]; then
++ MY_BASEDIR=/usr
++fi
++
+ #++
+ # Misc. Definitions
+ #--
+@@ -184,12 +202,21 @@
+ [ -d $MYSQL_TEST_DIR/var ] || mkdir $MYSQL_TEST_DIR/var
+ [ -d $MYSQL_TEST_DIR/var/tmp ] || mkdir $MYSQL_TEST_DIR/var/tmp
+ [ -d $MYSQL_TEST_DIR/var/run ] || mkdir $MYSQL_TEST_DIR/var/run
++[ -d $MYSQL_TEST_DIR -a "x$RUN_USER" != "x" ] && chown -R $RUN_USER $MYSQL_TEST_DIR
+
+ [ -z "$COLUMNS" ] && COLUMNS=80
+ E=`$EXPR $COLUMNS - 8`
+ #DASH72=`expr substr '------------------------------------------------------------------------' 1 $E`
+ DASH72=`$ECHO '------------------------------------------------------------------------'|$CUT -c 1-$E`
+
++if [ "x$DEBIAN" = "x1" ]; then
++ MYSQLD="/usr/sbin/mysqld"
++ MYSQL_TEST="/usr/sbin/mysqltest"
++ MYSQLADMIN="/usr/bin/mysqladmin"
++ INSTALL_DB="/var/mysql/mysql-test/install_test_db -debian"
++
++else
++
+ # on source dist, we pick up freshly build executables
+ # on binary, use what is installed
+ if [ x$SOURCE_DIST = x1 ] ; then
+@@ -250,6 +277,8 @@
+ read unused
+ }
+
++fi
++
+
+ error () {
+ $ECHO "Error: $1"
+@@ -365,7 +394,7 @@
+ --language=english \
+ --innobase_data_file_path=ibdata1:50M \
+ $SMALL_SERVER \
+- $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
++ $RUN_USER_OPT $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
+ if [ x$DO_DDD = x1 ]
+ then
+ $ECHO "set args $master_args" > $GDB_MASTER_INIT
+@@ -420,7 +449,7 @@
+ --language=english \
+ --skip-innobase \
+ $SMALL_SERVER \
+- $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
++ $RUN_USER_OPT $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
+ if [ x$DO_DDD = x1 ]
+ then
+ $ECHO "set args $master_args" > $GDB_SLAVE_INIT
View Lorry Controller Status