Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
698e0abd
Commit
698e0abd
authored
Oct 19, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
c7710510
c4a570aa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
39 deletions
+53
-39
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_cases.pl
+7
-5
mysql-test/lib/mtr_misc.pl
mysql-test/lib/mtr_misc.pl
+13
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+33
-33
No files found.
mysql-test/lib/mtr_cases.pl
View file @
698e0abd
...
@@ -263,9 +263,6 @@ sub collect_one_test_case($$$$$$$) {
...
@@ -263,9 +263,6 @@ sub collect_one_test_case($$$$$$$) {
return
;
return
;
}
}
# ----------------------------------------------------------------------
# Skip some tests but include in list, just mark them to skip
# ----------------------------------------------------------------------
my
$tinfo
=
{};
my
$tinfo
=
{};
$tinfo
->
{'
name
'}
=
$tname
;
$tinfo
->
{'
name
'}
=
$tname
;
...
@@ -273,6 +270,10 @@ sub collect_one_test_case($$$$$$$) {
...
@@ -273,6 +270,10 @@ sub collect_one_test_case($$$$$$$) {
$tinfo
->
{'
component_id
'}
=
$component_id
;
$tinfo
->
{'
component_id
'}
=
$component_id
;
push
(
@$cases
,
$tinfo
);
push
(
@$cases
,
$tinfo
);
# ----------------------------------------------------------------------
# Skip some tests but include in list, just mark them to skip
# ----------------------------------------------------------------------
if
(
$::opt_skip_test
and
defined
mtr_match_prefix
(
$tname
,
$::opt_skip_test
)
)
if
(
$::opt_skip_test
and
defined
mtr_match_prefix
(
$tname
,
$::opt_skip_test
)
)
{
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
skip
'}
=
1
;
...
@@ -356,8 +357,9 @@ sub collect_one_test_case($$$$$$$) {
...
@@ -356,8 +357,9 @@ sub collect_one_test_case($$$$$$$) {
$value
=
mtr_match_prefix
(
$opt
,
"
--default-time-zone=
");
$value
=
mtr_match_prefix
(
$opt
,
"
--default-time-zone=
");
if
(
defined
$value
)
if
(
defined
$value
)
{
{
$tinfo
->
{'
timezone
'}
=
"";
# Set timezone for this test case to something different
# Fallthrough, add this option
$tinfo
->
{'
timezone
'}
=
"
GMT-8
";
# Fallthrough, add the --default-time-zone option
}
}
# The --restart option forces a restart even if no special
# The --restart option forces a restart even if no special
...
...
mysql-test/lib/mtr_misc.pl
View file @
698e0abd
...
@@ -14,6 +14,7 @@ sub mtr_path_exists(@);
...
@@ -14,6 +14,7 @@ sub mtr_path_exists(@);
sub
mtr_script_exists
(@);
sub
mtr_script_exists
(@);
sub
mtr_file_exists
(@);
sub
mtr_file_exists
(@);
sub
mtr_exe_exists
(@);
sub
mtr_exe_exists
(@);
sub
mtr_exe_maybe_exists
(@);
sub
mtr_copy_dir
($$);
sub
mtr_copy_dir
($$);
sub
mtr_same_opts
($$);
sub
mtr_same_opts
($$);
sub
mtr_cmp_opts
($$);
sub
mtr_cmp_opts
($$);
...
@@ -110,8 +111,9 @@ sub mtr_file_exists (@) {
...
@@ -110,8 +111,9 @@ sub mtr_file_exists (@) {
return
"";
return
"";
}
}
sub
mtr_exe_exists
(@)
{
sub
mtr_exe_
maybe_
exists
(@)
{
my
@path
=
@_
;
my
@path
=
@_
;
map
{
$_
.=
"
.exe
"}
@path
if
$::glob_win32
;
map
{
$_
.=
"
.exe
"}
@path
if
$::glob_win32
;
foreach
my
$path
(
@path
)
foreach
my
$path
(
@path
)
{
{
...
@@ -124,6 +126,16 @@ sub mtr_exe_exists (@) {
...
@@ -124,6 +126,16 @@ sub mtr_exe_exists (@) {
return
$path
if
-
x
$path
;
return
$path
if
-
x
$path
;
}
}
}
}
return
"";
}
sub
mtr_exe_exists
(@)
{
my
@path
=
@_
;
if
(
my
$path
=
mtr_exe_maybe_exists
(
@path
))
{
return
$path
;
}
# Could not find exe, show error
if
(
@path
==
1
)
if
(
@path
==
1
)
{
{
mtr_error
("
Could not find
$path
[0]
");
mtr_error
("
Could not find
$path
[0]
");
...
...
mysql-test/mysql-test-run.pl
View file @
698e0abd
...
@@ -1313,9 +1313,8 @@ sub executable_setup () {
...
@@ -1313,9 +1313,8 @@ sub executable_setup () {
}
}
# Look for language files and charsetsdir, use same share
# Look for language files and charsetsdir, use same share
my
$path_share
=
mtr_path_exists
("
$glob_basedir
/share
",
my
$path_share
=
mtr_path_exists
("
$glob_basedir
/share
/mysql
",
"
$glob_basedir
/sql/share
",
"
$glob_basedir
/sql/share
",
"
$glob_basedir
/share/mysql
",
"
$glob_basedir
/share
");
"
$glob_basedir
/share
");
$path_language
=
mtr_path_exists
("
$path_share
/english
");
$path_language
=
mtr_path_exists
("
$path_share
/english
");
...
@@ -1373,31 +1372,31 @@ sub executable_setup () {
...
@@ -1373,31 +1372,31 @@ sub executable_setup () {
{
{
# Look for ndb tols and binaries
# Look for ndb tols and binaries
my
$ndb_path
=
mtr_path_exists
("
$glob_basedir
/ndb
",
my
$ndb_path
=
mtr_path_exists
("
$glob_basedir
/ndb
",
"
$glob_basedir
/storage/ndb
");
"
$glob_basedir
/storage/ndb
",
"
$glob_basedir
/bin
");
$path_ndb_tools_dir
=
mtr_path_exists
("
$ndb_path
/tools
",
$path_ndb_tools_dir
=
mtr_path_exists
("
$ndb_path
/tools
",
"
$
glob_basedir
/bin
");
"
$
ndb_path
");
$exe_ndb_mgm
=
$exe_ndb_mgm
=
mtr_exe_exists
("
$ndb_path
/src/mgmclient/ndb_mgm
",
mtr_exe_exists
("
$ndb_path
/src/mgmclient/ndb_mgm
",
"
$
glob_basedir
/bin
/ndb_mgm
");
"
$
ndb_path
/ndb_mgm
");
$exe_ndb_mgmd
=
$exe_ndb_mgmd
=
mtr_exe_exists
("
$ndb_path
/src/mgmsrv/ndb_mgmd
",
mtr_exe_exists
("
$ndb_path
/src/mgmsrv/ndb_mgmd
",
"
$
glob_basedir
/bin
/ndb_mgmd
");
"
$
ndb_path
/ndb_mgmd
");
$exe_ndb_waiter
=
$exe_ndb_waiter
=
mtr_exe_exists
("
$ndb_path
/tools/ndb_waiter
",
mtr_exe_exists
("
$ndb_path
/tools/ndb_waiter
",
"
$
glob_basedir
/bin
/ndb_waiter
");
"
$
ndb_path
/ndb_waiter
");
$exe_ndbd
=
$exe_ndbd
=
mtr_exe_exists
("
$ndb_path
/src/kernel/ndbd
",
mtr_exe_exists
("
$ndb_path
/src/kernel/ndbd
",
"
$
glob_basedir
/bin
/ndbd
");
"
$
ndb_path
/ndbd
");
if
(
$mysql_version_id
>=
50000
)
# May not exist
{
$path_ndb_examples_dir
=
$path_ndb_examples_dir
=
mtr_file_exists
("
$ndb_path
/ndbapi-examples
",
mtr_path_exists
("
$ndb_path
/ndbapi-examples
",
"
$ndb_path
/examples
");
"
$ndb_path
/examples
");
# May not exist
$exe_ndb_example
=
$exe_ndb_example
=
mtr_file_exists
("
$path_ndb_examples_dir
/ndbapi_simple/ndbapi_simple
");
mtr_file_exists
("
$path_ndb_examples_dir
/ndbapi_simple/ndbapi_simple
");
}
}
}
# Look for the udf_example library
# Look for the udf_example library
...
@@ -1420,27 +1419,20 @@ sub executable_setup () {
...
@@ -1420,27 +1419,20 @@ sub executable_setup () {
}
}
if
(
$glob_win32
and
$mysql_version_id
<
50000
)
# Look for mysql_client_test executable which may _not_ exist in
# some versions, test using it should be skipped
if
(
$glob_use_embedded_server
)
{
{
# Skip looking for exe_mysql_client_test as its not built by default
$exe_mysql_client_test
=
# in 4.1 for windows.
mtr_exe_maybe_exists
("
$glob_basedir
/libmysqld/examples/mysql_client_test_embedded
");
$exe_mysql_client_test
=
"
unavailable
";
}
}
else
else
{
{
# Look for mysql_client_test executable
$exe_mysql_client_test
=
if
(
$glob_use_embedded_server
)
mtr_exe_maybe_exists
("
$glob_basedir
/tests/mysql_client_test
",
{
"
$glob_basedir
/tests/release/mysql_client_test
",
$exe_mysql_client_test
=
"
$glob_basedir
/tests/debug/mysql_client_test
",
mtr_exe_exists
("
$glob_basedir
/libmysqld/examples/mysql_client_test_embedded
");
"
$glob_basedir
/bin
");
}
else
{
$exe_mysql_client_test
=
mtr_exe_exists
("
$glob_basedir
/tests/mysql_client_test
",
"
$glob_basedir
/tests/release/mysql_client_test
",
"
$glob_basedir
/tests/debug/mysql_client_test
");
}
}
}
}
}
...
@@ -2045,6 +2037,14 @@ sub check_ndbcluster_support ($) {
...
@@ -2045,6 +2037,14 @@ sub check_ndbcluster_support ($) {
$opt_skip_ndbcluster_slave
=
1
;
$opt_skip_ndbcluster_slave
=
1
;
return
;
return
;
}
}
elsif
(
-
e
"
$glob_basedir
/bin
"
&&
!
-
f
"
$glob_basedir
/bin/ndbd
")
{
# Binary dist with a mysqld that supports ndb, but no ndbd found
mtr_report
("
Skipping ndbcluster, can't fint binaries
");
$opt_skip_ndbcluster
=
1
;
$opt_skip_ndbcluster_slave
=
1
;
return
;
}
$glob_ndbcluster_supported
=
1
;
$glob_ndbcluster_supported
=
1
;
mtr_report
("
Using ndbcluster when necessary, mysqld supports it
");
mtr_report
("
Using ndbcluster when necessary, mysqld supports it
");
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment