diff options
author | unknown <monty@hundin.mysql.fi> | 2001-07-18 14:32:54 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-07-18 14:32:54 +0300 |
commit | 2cbf3b9b532e048dbe3d42669bff539c5864236e (patch) | |
tree | 439c4f787e95df0a5a9968168e8fa902d3fc3eea /support-files/debian/patches/ad | |
parent | 653d19af023b8a02a24cda15e69f674423f44377 (diff) | |
download | mariadb-git-2cbf3b9b532e048dbe3d42669bff539c5864236e.tar.gz |
Updated version number
Update to new debian files
configure.in:
Updated version number
sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha:
New benchmark results
support-files/debian/README.debian:
Update to new debian files
support-files/debian/changelog:
Update to new debian files
support-files/debian/control:
Update to new debian files
support-files/debian/gomi:
Update to new debian files
support-files/debian/move:
Update to new debian files
support-files/debian/patches/ab:
Update to new debian files
support-files/debian/patches/ad:
Update to new debian files
support-files/debian/patches/ae:
Update to new debian files
support-files/debian/rules:
Update to new debian files
support-files/debian/shlibs:
Update to new debian files
Diffstat (limited to 'support-files/debian/patches/ad')
-rw-r--r-- | support-files/debian/patches/ad | 53 |
1 files changed, 6 insertions, 47 deletions
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" |