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
58fad040
Commit
58fad040
authored
Mar 27, 2018
by
Daniele Sciascia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-13549 Fix and re-enable MTR test galera.galera_as_master
Was failing due to missing RESET MASTER
parent
2f2e7f8c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
mysql-test/suite/galera/disabled.def
mysql-test/suite/galera/disabled.def
+0
-1
mysql-test/suite/galera/r/galera_as_master.result
mysql-test/suite/galera/r/galera_as_master.result
+1
-0
mysql-test/suite/galera/t/galera_as_master.test
mysql-test/suite/galera/t/galera_as_master.test
+4
-2
No files found.
mysql-test/suite/galera/disabled.def
View file @
58fad040
...
...
@@ -41,7 +41,6 @@ lp1376747 : MDEV-13549 Galera test failures
galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures
galera_parallel_simple : MDEV-13549 Galera test failures
galera_admin : MDEV-13549 Galera test failures
galera_as_master: MDEV-13549 Galera test failures 10.1
galera_pc_ignore_sb : MDEV-13549 Galera test failures 10.1
galera_lock_table : MDEV-13549 Galera test failures 10.1
MW-284 : MDEV-13549 Galera test failures 10.1
...
...
mysql-test/suite/galera/r/galera_as_master.result
View file @
58fad040
...
...
@@ -47,3 +47,4 @@ DROP TABLE t2, t3;
STOP SLAVE;
RESET SLAVE ALL;
CALL mtr.add_suppression('You need to use --log-bin to make --binlog-format work');
RESET MASTER;
mysql-test/suite/galera/t/galera_as_master.test
View file @
58fad040
...
...
@@ -35,14 +35,14 @@ SELECT * FROM t3;
SELECT
*
FROM
t4
;
--
connection
node_3
SHOW
TABLES
;
--
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
2
FROM
t1
;
--
source
include
/
wait_condition
.
inc
--
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
3
FROM
t4
;
--
source
include
/
wait_condition
.
inc
SHOW
TABLES
;
SELECT
*
FROM
t1
;
SELECT
*
FROM
t4
;
...
...
@@ -63,3 +63,5 @@ RESET SLAVE ALL;
CALL
mtr
.
add_suppression
(
'You need to use --log-bin to make --binlog-format work'
);
--
connection
node_1
RESET
MASTER
;
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