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
be517384
Commit
be517384
authored
Jul 01, 2020
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-20428 after-merge fix: Stabilize the test
parent
c36834c8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result
.../suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result
+3
-3
mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test
...st/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test
+3
-3
No files found.
mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result
View file @
be517384
...
...
@@ -8,7 +8,7 @@ CHANGE MASTER TO MASTER_USE_GTID=current_pos;
include/start_slave.inc
connection master;
"Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')"
FOUND 1 /using_gtid\(1\), gtid\(\'\'\)/ in mysqld.1.err
FOUND 1 /using_gtid\(1\), gtid\(\'\'\)
.*
/ in mysqld.1.err
connection slave;
include/stop_slave.inc
CHANGE MASTER TO MASTER_USE_GTID=no;
...
...
@@ -25,7 +25,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
include/start_slave.inc
connection master;
"Test Case 3: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2')"
FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2\'\)/ in mysqld.1.err
FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2\'\)
.*
/ in mysqld.1.err
SET @@SESSION.gtid_domain_id=10;
INSERT INTO t VALUES(20);
connection slave;
...
...
@@ -35,7 +35,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
include/start_slave.inc
connection master;
"Test Case 4: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2,10-1-1')"
FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\)/ in mysqld.1.err
FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\)
.*
/ in mysqld.1.err
"===== Clean up ====="
connection slave;
include/stop_slave.inc
...
...
mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test
View file @
be517384
...
...
@@ -58,7 +58,7 @@ if(!$log_error_)
--
echo
"Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')"
--
let
SEARCH_FILE
=
$log_error_
--
let
SEARCH_RANGE
=-
50000
--
let
SEARCH_PATTERN
=
using_gtid
\
(
1
\
),
gtid
\
(
\
'\'\)
--
let
SEARCH_PATTERN
=
using_gtid
\
(
1
\
),
gtid
\
(
\
'\'\)
.*
--source include/search_pattern_in_file.inc
--connection slave
...
...
@@ -88,7 +88,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
--echo "Test Case 3: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('
0
-
1
-
2
')"
--let SEARCH_FILE=$log_error_
--let SEARCH_RANGE=-50000
--let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2\'\)
--let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2\'\)
.*
--source include/search_pattern_in_file.inc
SET @@SESSION.gtid_domain_id=10;
INSERT INTO t VALUES(20);
...
...
@@ -106,7 +106,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
--echo "Test Case 4: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('
0
-
1
-
2
,
10
-
1
-
1
'
)
"
--let SEARCH_FILE=
$log_error_
--let SEARCH_RANGE=-50000
--let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\)
--let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\)
.*
--source include/search_pattern_in_file.inc
--echo "
=====
Clean
up
=====
"
...
...
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