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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
46b86775
Commit
46b86775
authored
Jan 13, 2006
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated mysql-test-run.pl to adjust to ndb replication testing
parent
495ad634
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
146 additions
and
67 deletions
+146
-67
.bzrignore
.bzrignore
+2
-0
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_cases.pl
+10
-0
mysql-test/lib/mtr_match.pl
mysql-test/lib/mtr_match.pl
+17
-0
mysql-test/lib/mtr_stress.pl
mysql-test/lib/mtr_stress.pl
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+116
-66
No files found.
.bzrignore
View file @
46b86775
...
@@ -1670,3 +1670,5 @@ storage/ndb/test/ndbapi/testPartitioning
...
@@ -1670,3 +1670,5 @@ storage/ndb/test/ndbapi/testPartitioning
storage/ndb/test/ndbapi/testReadPerf
storage/ndb/test/ndbapi/testReadPerf
storage/ndb/test/ndbapi/test_event_merge
storage/ndb/test/ndbapi/test_event_merge
storage/ndb/test/tools/listen_event
storage/ndb/test/tools/listen_event
libmysqld/ha_ndbcluster_binlog.cc
libmysqld/rpl_injector.cc
mysql-test/lib/mtr_cases.pl
View file @
46b86775
...
@@ -252,6 +252,16 @@ sub collect_one_test_case($$$$$$$) {
...
@@ -252,6 +252,16 @@ sub collect_one_test_case($$$$$$$) {
$tinfo
->
{'
slave_restart
'}
=
1
;
$tinfo
->
{'
slave_restart
'}
=
1
;
}
}
if
(
(
$::opt_with_ndbcluster
or
$::glob_use_running_ndbcluster
)
and
defined
mtr_match_substring
(
$tname
,"
ndb
")
)
{
$tinfo
->
{'
ndb_test
'}
=
1
;
}
else
{
$tinfo
->
{'
ndb_test
'}
=
0
;
}
# FIXME what about embedded_server + ndbcluster, skip ?!
# FIXME what about embedded_server + ndbcluster, skip ?!
my
$master_opt_file
=
"
$testdir
/
$tname
-master.opt
";
my
$master_opt_file
=
"
$testdir
/
$tname
-master.opt
";
...
...
mysql-test/lib/mtr_match.pl
View file @
46b86775
...
@@ -50,6 +50,23 @@ sub mtr_match_extension ($$) {
...
@@ -50,6 +50,23 @@ sub mtr_match_extension ($$) {
}
}
# Match a substring anywere in a string
sub
mtr_match_substring
($$)
{
my
$string
=
shift
;
my
$substring
=
shift
;
if
(
$string
=~
/(.*)\Q$substring\E(.*)$/
)
# strncmp
{
return
$1
;
}
else
{
return
undef
;
# NULL
}
}
sub
mtr_match_any_exact
($$)
{
sub
mtr_match_any_exact
($$)
{
my
$string
=
shift
;
my
$string
=
shift
;
my
$mlist
=
shift
;
my
$mlist
=
shift
;
...
...
mysql-test/lib/mtr_stress.pl
View file @
46b86775
...
@@ -28,7 +28,7 @@ sub run_stress_test ()
...
@@ -28,7 +28,7 @@ sub run_stress_test ()
if
(
!
$::glob_use_embedded_server
and
!
$::opt_local_master
)
if
(
!
$::glob_use_embedded_server
and
!
$::opt_local_master
)
{
{
$::master
->
[
0
]
->
{'
pid
'}
=
mysqld_start
('
master
',
0
,
[]
,
[]
);
$::master
->
[
0
]
->
{'
pid
'}
=
mysqld_start
('
master
',
0
,
[]
,
[]
,
0
);
if
(
!
$::master
->
[
0
]
->
{'
pid
'}
)
if
(
!
$::master
->
[
0
]
->
{'
pid
'}
)
{
{
mtr_error
("
Can't start the mysqld server
");
mtr_error
("
Can't start the mysqld server
");
...
...
mysql-test/mysql-test-run.pl
View file @
46b86775
This diff is collapsed.
Click to expand 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