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
96b4a5a6
Commit
96b4a5a6
authored
Oct 06, 2021
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix galera_var_reject_queries test case
parent
a75813d4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
12 deletions
+5
-12
mysql-test/suite/galera/r/galera_var_reject_queries.result
mysql-test/suite/galera/r/galera_var_reject_queries.result
+3
-8
mysql-test/suite/galera/t/galera_var_reject_queries.test
mysql-test/suite/galera/t/galera_var_reject_queries.test
+2
-4
No files found.
mysql-test/suite/galera/r/galera_var_reject_queries.result
View file @
96b4a5a6
<<<<<<< HEAD
connection node_2;
connection node_2;
connection node_1;
connection node_1;
||||||| merged common ancestors
CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
=======
call mtr.add_suppression("WSREP has not yet prepared node for application use");
>>>>>>> 10.3
CREATE TABLE t1 (f1 INTEGER);
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
connection node_1;
connection node_1;
SET SESSION wsrep_reject_queries = ALL;
SET SESSION wsrep_reject_queries = ALL;
...
@@ -27,7 +22,7 @@ VARIABLE_VALUE = 2
...
@@ -27,7 +22,7 @@ VARIABLE_VALUE = 2
INSERT INTO t1 VALUES (1);
INSERT INTO t1 VALUES (1);
connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1;
connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1;
SET GLOBAL wsrep_reject_queries = NONE;
SET GLOBAL wsrep_reject_queries = NONE;
SELECT COUNT(*)
=
1 FROM t1;
SELECT COUNT(*)
AS EXPECT_
1 FROM t1;
COUNT(*) =
1
EXPECT_
1
1
1
DROP TABLE t1;
DROP TABLE t1;
mysql-test/suite/galera/t/galera_var_reject_queries.test
View file @
96b4a5a6
...
@@ -5,9 +5,7 @@
...
@@ -5,9 +5,7 @@
--
source
include
/
galera_cluster
.
inc
--
source
include
/
galera_cluster
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
call
mtr
.
add_suppression
(
"WSREP has not yet prepared node for application use"
);
CREATE
TABLE
t1
(
f1
INTEGER
NOT
NULL
PRIMARY
KEY
)
engine
=
innodb
;
CREATE
TABLE
t1
(
f1
INTEGER
);
--
connect
node_1a
,
127.0
.
0.1
,
root
,
,
test
,
$NODE_MYPORT_1
--
connect
node_1a
,
127.0
.
0.1
,
root
,
,
test
,
$NODE_MYPORT_1
...
@@ -44,6 +42,6 @@ INSERT INTO t1 VALUES (1);
...
@@ -44,6 +42,6 @@ INSERT INTO t1 VALUES (1);
--
connect
node_1c
,
127.0
.
0.1
,
root
,
,
test
,
$NODE_MYPORT_1
--
connect
node_1c
,
127.0
.
0.1
,
root
,
,
test
,
$NODE_MYPORT_1
SET
GLOBAL
wsrep_reject_queries
=
NONE
;
SET
GLOBAL
wsrep_reject_queries
=
NONE
;
SELECT
COUNT
(
*
)
=
1
FROM
t1
;
SELECT
COUNT
(
*
)
AS
EXPECT_
1
FROM
t1
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
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