From fc5ef361dcd91562f4e35613c66149341c3a81d3 Mon Sep 17 00:00:00 2001
From: unknown <monty@tik.mysql.fi>
Date: Tue, 5 Mar 2002 15:46:30 +0200
Subject: Update scripts for new POSIX spec Fix for --enable-local-infile
 Portability fix for bison

bdb/dist/s_recover:
  Update for new POSIX spec
configure.in:
  Fix for --enable-local-infile
libmysql/libmysql.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Update for new POSIX spec
scripts/safe_mysqld.sh:
  Update for new POSIX spec
sql-bench/server-cfg.sh:
  Update for new POSIX spec
sql/sql_yacc.yy:
  Portability fix for bison
---
 scripts/safe_mysqld.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index e7418819604..3494e3d707e 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -253,7 +253,7 @@ do
     I=1
     while test "$I" -le "$numofproces"
     do 
-      PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` 
+      PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` 
 	for T in $PROC
 	do
 	  break
-- 
cgit v1.2.1


From 1f5341d318a504cc182f28bb7e55387256be690f Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Wed, 6 Mar 2002 18:36:31 +0200
Subject: Fixed bug in DATE_FORMAT when used with GROUP BY

Build-tools/Do-compile:
  Fixed typo
Docs/manual.texi:
  Changelog
mysql-test/r/type_date.result:
  Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
  Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
  Fix for RAID files
sql/table.cc:
  Fixed typo in last patch
---
 scripts/mysqlhotcopy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index caf2615fe7a..b0fee84c332 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -37,7 +37,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome.
 
 # Documentation continued at end of file
 
-my $VERSION = "1.14";
+my $VERSION = "1.15";
 
 my $opt_tmpdir = $ENV{TMPDIR} || "/tmp";
 
@@ -562,7 +562,7 @@ sub copy_files {
 	# add recursive option for scp
 	push @cp, "-r" if $^O =~ /m^(solaris|linux|freebsd)$/ && $method =~ /^scp\b/;
 
-	my @non_raid = grep { $_ !~ m:\d\d/: } @$files;
+	my @non_raid = grep { ! m:/\d{2}/[^/]+$: } @$files;
 
 	# add files to copy and the destination directory
 	safe_system( @cp, @non_raid, $target );
-- 
cgit v1.2.1