database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

merge with MySQL 5.1.65

Browse Source
This commit is contained in:
Sergei Golubchik
2012-08-22 11:40:39 +02:00
parent 34f2f8ea41 1713550775
commit cefc30b166
119 changed files with 3766 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/lib/My/Find.pm
View File

@@ -126,9 +126,9 @@ sub my_find_file {
#
#
sub my_find_dir {
my ($base, $paths, $dirs, $required)= @_;
croak "usage: my_find_dir(<base>, <paths>[, <dirs>])"
unless (@_ == 3 or @_ == 2);
my ($base, $paths, $dirs, $optional)= @_;
croak "usage: my_find_dir(<base>, <paths>[, <dirs>[, <optional>]])"
unless (@_ == 3 or @_ == 2 or @_ == 4);
# -------------------------------------------------------
# Find and return the first directory
@@ -136,6 +136,7 @@ sub my_find_dir {
foreach my $path (my_find_paths($base, $paths, $dirs)) {
return $path if ( -d $path );
}
return "" if $optional;
find_error($base, $paths, $dirs);
}