From 06d7c276c32b351763b0910e8fb89e02d610f606 Mon Sep 17 00:00:00 2001
From: unknown <monty@donna.mysql.com>
Date: Fri, 12 Jan 2001 13:52:32 +0200
Subject: Patches for NetBSD/macppc Fixed bug in LEFT JOIN Added
 bdb_log_buffer_size

Docs/manual.texi:
  Added documentation for mysqlhotcopy
client/mysql.cc:
  Fixed core dump when column names couldn't be read
configure.in:
  Fixed possible error
mit-pthreads/Changes-mysql:
  Patches for NetBSD/macppc
mit-pthreads/config/config.guess:
  Patches for NetBSD/macppc
mit-pthreads/config/configure.in:
  Patches for NetBSD/macppc
mit-pthreads/config/configure:
  Patches for NetBSD/macppc
mysql-test/r/join_outer.result:
  New join test
mysql-test/t/join_outer.test:
  New join test
scripts/mysqlhotcopy.sh:
  Patches from ASK
sql/ha_berkeley.cc:
  Adeed log buffer cache
sql/ha_berkeley.h:
  Adeed log buffer cache
sql/log.cc:
  Fixed possible overrun bug
sql/mysqld.cc:
  Fix for Mac OS X public beta
  Added bdb_log_buffer_size
sql/sql_select.cc:
  Fixed bug in LEFT JOIN
tests/mail_to_db.pl:
  Removed unsubscribe tails
tests/pmail.pl:
  Sort mails according to date
---
 scripts/mysqlhotcopy.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index c8c62a88ccb..bf857c67cea 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -1,4 +1,4 @@
-#!@PERL@
+#!@PERL@ -w
 
 use strict;
 use Getopt::Long;
@@ -36,8 +36,9 @@ WARNING: THIS IS VERY MUCH A FIRST-CUT ALPHA. Comments/patches welcome.
 
 # Documentation continued at end of file
 
-my $VERSION = "1.9";
-my $opt_tmpdir= $main::ENV{TMPDIR};
+my $VERSION = "1.10";
+
+my $opt_tmpdir = $ENV{TMPDIR} || "/tmp";
 
 my $OPTIONS = <<"_OPTIONS";
 
@@ -74,7 +75,7 @@ sub usage {
 }
 
 my %opt = (
-    user	=> getpwuid($>),
+    user	=> scalar getpwuid($>),
     noindices	=> 0,
     allowold	=> 0,	# for safety
     keepold	=> 0,
@@ -139,7 +140,7 @@ else {
 
 my %mysqld_vars;
 my $start_time = time;
-my $opt_tmpdir= $opt{tmpdir} ? $opt{tmpdir} : $main::ENV{TMPDIR};
+$opt_tmpdir= $opt{tmpdir} if $opt{tmpdir};
 $0 = $1 if $0 =~ m:/([^/]+)$:;
 $opt{quiet} = 0 if $opt{debug};
 $opt{allowold} = 1 if $opt{keepold};
@@ -235,16 +236,17 @@ foreach my $rdb ( @db_desc ) {
       or die "Cannot open dir '$db_dir': $!";
 
     my %db_files;
-    map { ( /(.+)\.\w+$/ ? { $db_files{$_} = $1 } : () ) } readdir(DBDIR);
+    map { ( /(.+)\.\w+$/ ? ( $db_files{$_} = $1 ) : () ) } readdir(DBDIR);
     unless( keys %db_files ) {
 	warn "'$db' is an empty database\n";
     }
     closedir( DBDIR );
 
     ## filter (out) files specified in t_regex
-    my @db_files = sort ( $negated 
+    my @db_files = ( $negated 
 			  ? grep { $db_files{$_} !~ $t_regex } keys %db_files
 			  : grep { $db_files{$_} =~ $t_regex } keys %db_files );
+    @db_files = sort @db_files;
     my @index_files=();
 
     ## remove indices unless we're told to keep them
@@ -776,3 +778,5 @@ Scott Wiersdorf - added table regex and scp support
 
 Monty - working --noindex (copy only first 2048 bytes of index file)
         Fixes for --method=scp
+
+Ask Bjoern Hansen - Cleanup code to fix a few bugs and enable -w again.
-- 
cgit v1.2.1