diff options
| author | unknown <lenz@mysql.com> | 2005-03-15 12:28:43 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-03-15 12:28:43 +0100 |
| commit | 7031cea4718b488eaec31c0f552c49096997663c (patch) | |
| tree | e1219609041213d5762af4f2296f26baeaf1161e /Build-tools | |
| parent | 01df5a157fb1b70dda18b4bdfa64e8635b930a24 (diff) | |
| parent | 8418e31fc35d150bcac4fa646db11cdb5e8fc4bd (diff) | |
| download | mariadb-git-7031cea4718b488eaec31c0f552c49096997663c.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0
support-files/mysql.server.sh:
Auto merged
Diffstat (limited to 'Build-tools')
| -rw-r--r-- | Build-tools/Do-solaris-pkg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Build-tools/Do-solaris-pkg b/Build-tools/Do-solaris-pkg index 8815033146c..22d68793808 100644 --- a/Build-tools/Do-solaris-pkg +++ b/Build-tools/Do-solaris-pkg @@ -57,7 +57,7 @@ unlink $temp or warn "Unable to remove tempfile ($!)\n"; # First get some info $fullname =~ s,/+$,,; # Remove ending slash if any -$fullname =~ /^((mysql)-\w+-?\w+?)-([\d\.]+\w?)-.+$/ +$fullname =~ /^((mysql)(?:-\w+){1,3})-([\d\.]+\w?)-.+$/ or die "This name is not what I expected - \"$fullname\""; $default{"name"}= $2; |