summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-03-06 18:36:31 +0200
committerunknown <monty@hundin.mysql.fi>2002-03-06 18:36:31 +0200
commitd6998363afc004fd92248af521ed40fa52027954 (patch)
treeb15e545bf81d86ec528ceb737592fa34e6024c18 /scripts
parent39cdb786fd7db97399fff788df7547f5be73b132 (diff)
downloadmariadb-git-d6998363afc004fd92248af521ed40fa52027954.tar.gz
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
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqlhotcopy.sh4
1 files changed, 2 insertions, 2 deletions
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 );