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
3d95737e
Commit
3d95737e
authored
Dec 23, 2022
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
galera.galera_wsrep_new_cluster: fix bad merge
parent
111a752b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
36 deletions
+0
-36
mysql-test/suite/galera/r/galera_wsrep_new_cluster.result
mysql-test/suite/galera/r/galera_wsrep_new_cluster.result
+0
-8
mysql-test/suite/galera/t/galera_wsrep_new_cluster.test
mysql-test/suite/galera/t/galera_wsrep_new_cluster.test
+0
-28
No files found.
mysql-test/suite/galera/r/galera_wsrep_new_cluster.result
View file @
3d95737e
...
...
@@ -9,14 +9,6 @@ connection node_2;
Cleaning grastate.dat file ...
Starting server ...
connection node_1;
connection node_2;
connection node_2;
Shutting down server ...
connection node_1;
connection node_2;
Cleaning grastate.dat file ...
Starting server ...
connection node_1;
SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
VARIABLE_VALUE
Primary
...
...
mysql-test/suite/galera/t/galera_wsrep_new_cluster.test
View file @
3d95737e
...
...
@@ -34,34 +34,6 @@
--
source
include
/
start_mysqld
.
inc
--
source
include
/
wait_until_ready
.
inc
# Save original auto_increment_offset values.
--
let
$node_1
=
node_1
--
let
$node_2
=
node_2
--
source
include
/
auto_increment_offset_save
.
inc
--
connection
node_2
--
echo
Shutting
down
server
...
--
source
include
/
shutdown_mysqld
.
inc
--
connection
node_1
--
let
$wait_condition
=
SELECT
VARIABLE_VALUE
=
1
FROM
INFORMATION_SCHEMA
.
GLOBAL_STATUS
WHERE
VARIABLE_NAME
=
'wsrep_cluster_size'
--
source
include
/
wait_condition
.
inc
--
connection
node_2
#
# Delete grastate.dat with safe_to_bootstrap: 0
#
--
echo
Cleaning
grastate
.
dat
file
...
--
remove_file
$MYSQLTEST_VARDIR
/
mysqld
.
2
/
data
/
grastate
.
dat
--
echo
Starting
server
...
--
let
$restart_noprint
=
2
--
let
$start_mysqld_params
=
"--wsrep-new-cluster"
--
source
include
/
start_mysqld
.
inc
--
source
include
/
wait_until_ready
.
inc
--
connection
node_1
--
let
$wait_condition
=
SELECT
VARIABLE_VALUE
=
'Primary'
FROM
INFORMATION_SCHEMA
.
GLOBAL_STATUS
WHERE
VARIABLE_NAME
=
'wsrep_cluster_status'
;
...
...
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