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/aa11
-rw-r--r--support-files/debian/patches/ab11
-rw-r--r--support-files/debian/patches/ac8
-rw-r--r--support-files/debian/patches/ad11
-rw-r--r--support-files/debian/patches/ae35
-rw-r--r--support-files/debian/patches/az39
-rw-r--r--support-files/debian/patches/ta68
-rw-r--r--support-files/debian/patches/tb86
8 files changed, 0 insertions, 269 deletions
diff --git a/support-files/debian/patches/aa b/support-files/debian/patches/aa
deleted file mode 100644
index 288197370be..00000000000
--- a/support-files/debian/patches/aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-3.23.23.orig/sql/Makefile.in
-+++ mysql-3.23.23/sql/Makefile.in
-@@ -366,7 +366,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/ab b/support-files/debian/patches/ab
deleted file mode 100644
index e169ee38188..00000000000
--- a/support-files/debian/patches/ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/ac b/support-files/debian/patches/ac
deleted file mode 100644
index 8cc2cd5dff1..00000000000
--- a/support-files/debian/patches/ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- mysql-3.23.23.orig/scripts/msql2mysql.sh
-+++ mysql-3.23.23/scripts/msql2mysql.sh
-@@ -13,4 +13,4 @@
- # described in the License. Among other things, the License requires that
- # the copyright notice and this notice be preserved on all copies.
-
--@bindir@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
-+@bindir@/mysql_replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
diff --git a/support-files/debian/patches/ad b/support-files/debian/patches/ad
deleted file mode 100644
index 25394116ad9..00000000000
--- a/support-files/debian/patches/ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 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 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
deleted file mode 100644
index 7ea5733147f..00000000000
--- a/support-files/debian/patches/ae
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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
-
-- if test -x $bindir/safe_mysqld
-+ if test -x $sbindir/safe_mysqld
- then
- # Give extra arguments to mysqld with the my.cnf file. This script may
- # be overwritten at next upgrade.
-- $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"
- fi
- ;;
-
diff --git a/support-files/debian/patches/az b/support-files/debian/patches/az
deleted file mode 100644
index 0795946de32..00000000000
--- a/support-files/debian/patches/az
+++ /dev/null
@@ -1,39 +0,0 @@
---- mysql-3.23.23.orig/configure
-+++ mysql-3.23.23/configure
-@@ -202,7 +202,7 @@
- --with-charset=CHARSET use CHARSET by default (one of: big5 cp1251 cp1257
- croat czech danish dec8 dos estonia euc_kr gb2312 gbk
- german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
-- latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr
-+ latin1 latin2 swe7 usa7 win1250 win1251ukr
- ujis sjis tis620; default is latin1)"
- ac_help="$ac_help
- --with-extra-charsets=cs1,cs2
-@@ -8843,7 +8843,7 @@
-
- # Choose a character set
-
--CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620"
-+CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620"
- DEFAULT_CHARSET=latin1
-
- # Check whether --with-charset or --without-charset was given.
---- mysql-3.23.23.orig/configure.in
-+++ mysql-3.23.23/configure.in
-@@ -1517,14 +1517,14 @@
- dnl or other special handling, you must also create
- dnl strings/ctype-$charset_name.c
-
--CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr ujis sjis tis620"
-+CHARSETS_AVAILABLE="big5 cp1251 cp1257 croat czech danish dec8 dos estonia euc_kr gb2312 gbk german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr latin1 latin2 swe7 usa7 win1250 win1251ukr ujis sjis tis620"
- DEFAULT_CHARSET=latin1
-
- AC_ARG_WITH(charset,
- [ --with-charset=CHARSET use CHARSET by default (one of: big5 cp1251 cp1257
- croat czech danish dec8 dos estonia euc_kr gb2312 gbk
- german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
-- latin1 latin2 swe7 usa7 win1250 win1251 win1251ukr
-+ latin1 latin2 swe7 usa7 win1250 win1251ukr
- ujis sjis tis620; default is latin1)],
- [default_charset="$withval"],
- [default_charset="$DEFAULT_CHARSET"])
diff --git a/support-files/debian/patches/ta b/support-files/debian/patches/ta
deleted file mode 100644
index b27259f4473..00000000000
--- a/support-files/debian/patches/ta
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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
deleted file mode 100644
index c3890dcab62..00000000000
--- a/support-files/debian/patches/tb
+++ /dev/null
@@ -1,86 +0,0 @@
---- 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