mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint client/mysql.cc: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp-error.test: Auto merged include/mysql_h.ic: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/view.test: Auto merged mysys/my_lock.c: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/mysql-test-run.pl: Use remote include/Makefile.am: Manual merge
This commit is contained in:
@ -66,9 +66,10 @@ sub mtr_add_arg ($$@) {
|
||||
|
||||
##############################################################################
|
||||
|
||||
# Note - More specific paths should be given before less specific. For examle
|
||||
# /client/debug should be listed before /client
|
||||
|
||||
#
|
||||
# NOTE! More specific paths should be given before less specific.
|
||||
# For example /client/debug should be listed before /client
|
||||
#
|
||||
sub mtr_path_exists (@) {
|
||||
foreach my $path ( @_ )
|
||||
{
|
||||
@ -84,9 +85,11 @@ sub mtr_path_exists (@) {
|
||||
}
|
||||
}
|
||||
|
||||
# Note - More specific paths should be given before less specific. For examle
|
||||
# /client/debug should be listed before /client
|
||||
|
||||
#
|
||||
# NOTE! More specific paths should be given before less specific.
|
||||
# For example /client/debug should be listed before /client
|
||||
#
|
||||
sub mtr_script_exists (@) {
|
||||
foreach my $path ( @_ )
|
||||
{
|
||||
@ -109,6 +112,11 @@ sub mtr_script_exists (@) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# NOTE! More specific paths should be given before less specific.
|
||||
# For example /client/debug should be listed before /client
|
||||
#
|
||||
sub mtr_file_exists (@) {
|
||||
foreach my $path ( @_ )
|
||||
{
|
||||
@ -117,20 +125,11 @@ sub mtr_file_exists (@) {
|
||||
return "";
|
||||
}
|
||||
|
||||
# Note - More specific paths should be given before less specific. For examle
|
||||
# /client/debug should be listed before /client
|
||||
|
||||
sub mtr_file_exists (@) {
|
||||
foreach my $path ( @_ )
|
||||
{
|
||||
return $path if -e $path;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
# Note - More specific paths should be given before less specific. For examle
|
||||
# /client/debug should be listed before /client
|
||||
|
||||
#
|
||||
# NOTE! More specific paths should be given before less specific.
|
||||
# For example /client/debug should be listed before /client
|
||||
#
|
||||
sub mtr_exe_maybe_exists (@) {
|
||||
my @path= @_;
|
||||
|
||||
@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) {
|
||||
return "";
|
||||
}
|
||||
|
||||
# Note - More specific paths should be given before less specific. For examle
|
||||
# /client/debug should be listed before /client
|
||||
|
||||
#
|
||||
# NOTE! More specific paths should be given before less specific.
|
||||
# For example /client/debug should be listed before /client
|
||||
#
|
||||
sub mtr_exe_exists (@) {
|
||||
my @path= @_;
|
||||
if (my $path= mtr_exe_maybe_exists(@path))
|
||||
@ -174,7 +175,7 @@ sub mtr_copy_dir($$) {
|
||||
my $from_dir= shift;
|
||||
my $to_dir= shift;
|
||||
|
||||
# mtr_verbose("Copying from $from_dir to $to_dir");
|
||||
# mtr_verbose("Copying from $from_dir to $to_dir");
|
||||
|
||||
mkpath("$to_dir");
|
||||
opendir(DIR, "$from_dir")
|
||||
|
Reference in New Issue
Block a user