database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-06 05:42:06 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-02-12 12:04:10 +01:00
parent 31d6e9c3c8 8a9cdc5f44
commit b953d70d15
16 changed files with 129 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/galera_3nodes/r/galera_garbd.result
View File

@@ -1,4 +1,8 @@
connection node_1;
connection node_2;
connection node_3;
Killing node #3 to free ports for garbd ...
connection node_3;
connection node_1;
Starting garbd ...
CREATE TABLE t1 (f1 INTEGER);

20
mysql-test/suite/galera_3nodes/r/galera_safe_to_bootstrap.result
View File

@@ -11,15 +11,8 @@ connection node_1;
include/assert_grep.inc [grastate.dat does not have 'safe_to_bootstrap: 0']
include/assert_grep.inc [grastate.dat does not have 'safe_to_bootstrap: 0']
include/assert_grep.inc [grastate.dat does not have 'safe_to_bootstrap: 0']
<<<<<<< HEAD
connection node_3;
connection node_1;
||||||| merged common ancestors
=======
connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
connection node_3;
connection node_1;
>>>>>>> 10.2
include/assert_grep.inc [grastate.dat does not have 'safe_to_bootstrap: 0']
include/assert_grep.inc [grastate.dat does not have 'safe_to_bootstrap: 0']
include/assert_grep.inc [grastate.dat does not have 'safe_to_bootstrap: 1']
@@ -35,7 +28,6 @@ Killing server ...
safe_to_bootstrap: 1
safe_to_bootstrap: 0
safe_to_bootstrap: 0
<<<<<<< HEAD
connection node_1;
connection node_2;
connection node_3;
@@ -45,25 +37,13 @@ CALL mtr.add_suppression("WSREP: It may not be safe to bootstrap the cluster fro
CALL mtr.add_suppression("WSREP: wsrep::connect(.*) failed: 7");
CALL mtr.add_suppression("Aborting");
CALL mtr.add_suppression("WSREP: moving position backwards: [0-9]+ -> 0");
||||||| merged common ancestors
=======
connection node_1;
connection node_2;
connection node_3;
connection node_2;
>>>>>>> 10.2
CALL mtr.add_suppression("Failed to prepare for incremental state transfer");
<<<<<<< HEAD
connection node_3;
CALL mtr.add_suppression("WSREP: no nodes coming from prim view, prim not possible");
CALL mtr.add_suppression("WSREP: It may not be safe to bootstrap the cluster from this node");
CALL mtr.add_suppression("WSREP: wsrep::connect(.*) failed: 7");
CALL mtr.add_suppression("Aborting");
CALL mtr.add_suppression("WSREP: moving position backwards: [0-9]+ -> 0");
||||||| merged common ancestors
=======
connection node_3;
>>>>>>> 10.2
CALL mtr.add_suppression("Failed to prepare for incremental state transfer");
SHOW CREATE TABLE t1;
Table Create Table

4
mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result
View File

@@ -1,3 +1,7 @@
connection node_1;
connection node_2;
connection node_3;
connection node_1;
CREATE TABLE t1 (f1 INTEGER);
INSERT INTO t1 VALUES (1);
connection node_2;