Skip to content

Commit 72f1384

Browse files
grooverdangrooverdan
committed
Merge branch 10.4 into 10.5
2 parents 8518165 + 382e85f commit 72f1384

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+319
-3978
lines changed

‎mysql-test/std_data/wsrep_notify.sh

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,32 @@
66
#
77
# Edit parameters below to specify the address and login to server:
88
#
9-
USER=root
10-
PSWD=
9+
USER='root'
10+
PSWD=''
1111
#
1212
# If these parameters are not set, then the values
1313
# passed by the server are taken:
1414
#
15-
HOST=127.0.0.1
15+
HOST="127.0.0.1"
1616
PORT=$NODE_MYPORT_1
1717
#
1818
# Edit parameters below to specify SSL parameters:
1919
#
20-
ssl_key=
21-
ssl_cert=
22-
ssl_ca=
23-
ssl_capath=
24-
ssl_cipher=
25-
ssl_crl=
26-
ssl_crlpath=
20+
ssl_cert=""
21+
ssl_key=""
22+
ssl_ca=""
23+
ssl_capath=""
24+
ssl_cipher=""
25+
ssl_crl=""
26+
ssl_crlpath=""
2727
ssl_verify_server_cert=0
2828
#
2929
# Client executable path:
3030
#
3131
CLIENT="$EXE_MYSQL"
32-
32+
#
33+
# Name of schema and tables:
34+
#
3335
SCHEMA="mtr_wsrep_notify"
3436
MEMB_TABLE="$SCHEMA.membership"
3537
STATUS_TABLE="$SCHEMA.status"
@@ -65,9 +67,9 @@ configuration_change()
6567
do
6668
echo "INSERT INTO $MEMB_TABLE VALUES ( $idx, "
6769
# Don't forget to properly quote string values
68-
echo "'$NODE'" | sed s/\\//\',\'/g
70+
echo "'$NODE'" | sed s/\\//\',\'/g
6971
echo ");"
70-
idx=$(( $idx + 1 ))
72+
idx=$(( $idx+1 ))
7173
done
7274

7375
echo "INSERT INTO $STATUS_TABLE VALUES($idx, $INDEX, '$STATUS', '$CLUSTER_UUID', $PRIMARY);"
@@ -102,34 +104,35 @@ trim_string()
102104
fi
103105
}
104106

105-
COM=status_update # not a configuration change by default
107+
COM='status_update' # not a configuration change by default
106108

107109
STATUS=""
108110
CLUSTER_UUID=""
109-
PRIMARY="0"
111+
PRIMARY=0
110112
INDEX=""
111113
MEMBERS=""
112114

113115
while [ $# -gt 0 ]; do
114116
case $1 in
115-
--status)
117+
'--status')
116118
STATUS=$(trim_string "$2")
117119
shift
118120
;;
119-
--uuid)
121+
'--uuid')
120122
CLUSTER_UUID=$(trim_string "$2")
121123
shift
122124
;;
123-
--primary)
124-
[ "$2" = "yes" ] && PRIMARY="1" || PRIMARY="0"
125-
COM=configuration_change
125+
'--primary')
126+
arg=$(trim_string "$2")
127+
[ "$arg" = 'yes' ] && PRIMARY=1 || PRIMARY=0
128+
COM='configuration_change'
126129
shift
127130
;;
128-
--index)
131+
'--index')
129132
INDEX=$(trim_string "$2")
130133
shift
131134
;;
132-
--members)
135+
'--members')
133136
MEMBERS=$(trim_string "$2")
134137
shift
135138
;;
@@ -168,9 +171,7 @@ ssl_verify_server_cert=$(trim_string "$ssl_verify_server_cert");
168171

169172
SSL_PARAM=""
170173

171-
if [ -n "$ssl_key" -o -n "$ssl_cert" -o \
172-
-n "$ssl_ca" -o -n "$ssl_capath" -o \
173-
-n "$ssl_cipher" ]
174+
if [ -n "$ssl_key$ssl_cert$ssl_ca$ssl_capath$ssl_cipher$ssl_crl$ssl_crlpath" ]
174175
then
175176
SSL_PARAM=' --ssl'
176177
[ -n "$ssl_key" ] && SSL_PARAM="$SSL_PARAM --ssl-key='$ssl_key'"
@@ -181,8 +182,10 @@ then
181182
[ -n "$ssl_crl" ] && SSL_PARAM="$SSL_PARAM --ssl-crl='$ssl_crl'"
182183
[ -n "$ssl_crlpath" ] && SSL_PARAM="$SSL_PARAM --ssl-crlpath='$ssl_crlpath'"
183184
if [ -n "$ssl_verify_server_cert" ]; then
184-
if [ $ssl_verify_server_cert -ne 0 ]; then
185-
SSL_PARAM+=' --ssl-verify-server-cert'
185+
if [ "$ssl_verify_server_cert" != "0" -o \
186+
"$ssl_verify_server_cert" = "on" ]
187+
then
188+
SSL_PARAM="$SSL_PARAM --ssl-verify-server-cert"
186189
fi
187190
fi
188191
fi

‎mysql-test/std_data/wsrep_notify_ssl.sh

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,32 @@
66
#
77
# Edit parameters below to specify the address and login to server:
88
#
9-
USER=root
10-
PSWD=
9+
USER='root'
10+
PSWD=''
1111
#
1212
# If these parameters are not set, then the values
1313
# passed by the server are taken:
1414
#
15-
HOST=127.0.0.1
15+
HOST="127.0.0.1"
1616
PORT=$NODE_MYPORT_1
1717
#
1818
# Edit parameters below to specify SSL parameters:
1919
#
2020
ssl_cert="$MYSQL_TEST_DIR/std_data/client-cert.pem"
2121
ssl_key="$MYSQL_TEST_DIR/std_data/client-key.pem"
2222
ssl_ca="$MYSQL_TEST_DIR/std_data/cacert.pem"
23-
ssl_capath=
24-
ssl_cipher=
25-
ssl_crl=
26-
ssl_crlpath=
23+
ssl_capath=""
24+
ssl_cipher=""
25+
ssl_crl=""
26+
ssl_crlpath=""
2727
ssl_verify_server_cert=0
2828
#
2929
# Client executable path:
3030
#
3131
CLIENT="$EXE_MYSQL"
32-
32+
#
33+
# Name of schema and tables:
34+
#
3335
SCHEMA="mtr_wsrep_notify"
3436
MEMB_TABLE="$SCHEMA.membership"
3537
STATUS_TABLE="$SCHEMA.status"
@@ -65,9 +67,9 @@ configuration_change()
6567
do
6668
echo "INSERT INTO $MEMB_TABLE VALUES ( $idx, "
6769
# Don't forget to properly quote string values
68-
echo "'$NODE'" | sed s/\\//\',\'/g
70+
echo "'$NODE'" | sed s/\\//\',\'/g
6971
echo ");"
70-
idx=$(( $idx + 1 ))
72+
idx=$(( $idx+1 ))
7173
done
7274

7375
echo "INSERT INTO $STATUS_TABLE VALUES($idx, $INDEX, '$STATUS', '$CLUSTER_UUID', $PRIMARY);"
@@ -102,34 +104,35 @@ trim_string()
102104
fi
103105
}
104106

105-
COM=status_update # not a configuration change by default
107+
COM='status_update' # not a configuration change by default
106108

107109
STATUS=""
108110
CLUSTER_UUID=""
109-
PRIMARY="0"
111+
PRIMARY=0
110112
INDEX=""
111113
MEMBERS=""
112114

113115
while [ $# -gt 0 ]; do
114116
case $1 in
115-
--status)
117+
'--status')
116118
STATUS=$(trim_string "$2")
117119
shift
118120
;;
119-
--uuid)
121+
'--uuid')
120122
CLUSTER_UUID=$(trim_string "$2")
121123
shift
122124
;;
123-
--primary)
124-
[ "$2" = "yes" ] && PRIMARY="1" || PRIMARY="0"
125-
COM=configuration_change
125+
'--primary')
126+
arg=$(trim_string "$2")
127+
[ "$arg" = 'yes' ] && PRIMARY=1 || PRIMARY=0
128+
COM='configuration_change'
126129
shift
127130
;;
128-
--index)
131+
'--index')
129132
INDEX=$(trim_string "$2")
130133
shift
131134
;;
132-
--members)
135+
'--members')
133136
MEMBERS=$(trim_string "$2")
134137
shift
135138
;;
@@ -168,9 +171,7 @@ ssl_verify_server_cert=$(trim_string "$ssl_verify_server_cert");
168171

169172
SSL_PARAM=""
170173

171-
if [ -n "$ssl_key" -o -n "$ssl_cert" -o \
172-
-n "$ssl_ca" -o -n "$ssl_capath" -o \
173-
-n "$ssl_cipher" ]
174+
if [ -n "$ssl_key$ssl_cert$ssl_ca$ssl_capath$ssl_cipher$ssl_crl$ssl_crlpath" ]
174175
then
175176
SSL_PARAM=' --ssl'
176177
[ -n "$ssl_key" ] && SSL_PARAM="$SSL_PARAM --ssl-key='$ssl_key'"
@@ -181,8 +182,10 @@ then
181182
[ -n "$ssl_crl" ] && SSL_PARAM="$SSL_PARAM --ssl-crl='$ssl_crl'"
182183
[ -n "$ssl_crlpath" ] && SSL_PARAM="$SSL_PARAM --ssl-crlpath='$ssl_crlpath'"
183184
if [ -n "$ssl_verify_server_cert" ]; then
184-
if [ $ssl_verify_server_cert -ne 0 ]; then
185-
SSL_PARAM+=' --ssl-verify-server-cert'
185+
if [ "$ssl_verify_server_cert" != "0" -o \
186+
"$ssl_verify_server_cert" = "on" ]
187+
then
188+
SSL_PARAM="$SSL_PARAM --ssl-verify-server-cert"
186189
fi
187190
fi
188191
fi

‎mysql-test/suite/galera/disabled.def

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,16 @@
1010
#
1111
##############################################################################
1212

13-
GCF-939 : MDEV-21520 galera.GCF-939
14-
MW-329 : MDEV-19962 Galera test failure on MW-329
1513
galera_as_slave_ctas : MDEV-28378 timeout
16-
galera_as_slave_replication_bundle : MDEV-15785 OPTION_GTID_BEGIN is set in Gtid_log_event::do_apply_event()
17-
galera_bf_abort_group_commit : MDEV-18282 Galera test failure on galera.galera_bf_abort_group_commit
1814
galera_bf_kill_debug : MDEV-24485 wsrep::client_state::do_acquire_ownership(): Assertion `state_ == s_idle || mode_ != m_local' failed
19-
galera_bf_lock_wait : MDEV-21597 wsrep::transaction::start_transaction(): Assertion `active() == false' failed
20-
galera_encrypt_tmp_files : Get error failed to enable encryption of temporary files
21-
galera_gcache_recover_manytrx : MDEV-18834 Galera test failure
22-
galera_parallel_simple : MDEV-20318 galera.galera_parallel_simple fails
2315
galera_pc_recovery : MDEV-25199 cluster fails to start up
24-
galera_shutdown_nonprim : MDEV-21493 galera.galera_shutdown_nonprim
25-
galera_var_ignore_apply_errors : MDEV-26770 galera_var_ignore_apply_errors fails Server did not transition to READY state
16+
galera_sst_encrypted : MDEV-29876 Galera test failure on galera_sst_encrypted
17+
galera.MW-284 : MDEV-29861 Galera test case hangs
18+
galera.galera_binlog_checksum : MDEV-29861 Galera test case hangs
19+
galera_var_notify_ssl_ipv6 : MDEV-29861 Galera test case hangs
2620
galera_var_node_address : MDEV-20485 Galera test failure
2721
galera_var_notify_cmd : MDEV-21905 Galera test galera_var_notify_cmd causes hang
2822
galera_var_notify_ssl_ipv6 : hangs after the merge of MDEV-27682
2923
galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit
30-
partition : MDEV-19958 Galera test failure on galera.partition
31-
query_cache : MDEV-15805 Test failure on galera.query_cache
32-
versioning_trx_id : MDEV-18590: galera.versioning_trx_id: Test failure: mysqltest: Result content mismatch
33-
galera_bf_abort_at_after_statement : Unstable
3424
galera_bf_abort_shutdown : MDEV-29773 Assertion failure on sql/wsrep_mysqld.cc:2893 in wsrep_bf_abort_shutdown
35-
galera.MW-284 : MDEV-29861: Galera test case hangs
36-
galera.galera_binlog_checksum : MDEV-29861: Galera test case hangs
37-
galera_var_notify_ssl_ipv6 : MDEV-29861: Galera test case hangs
25+
MDEV-26575 : MDEV-29878 Galera test failure on MDEV-26575

‎mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ CALL insert_1m ();;
9494
connection node_1_insert_10m;
9595
CALL insert_10m ();;
9696
connection node_2;
97+
call mtr.add_suppression("Error in Log_event::read_log_event():.*");
9798
SET SESSION wsrep_sync_wait = 0;
9899
Killing server ...
99100
connection node_1;
@@ -130,9 +131,11 @@ DROP PROCEDURE update_simple;
130131
DROP PROCEDURE insert_1k;
131132
DROP PROCEDURE insert_1m;
132133
connection node_1;
134+
call mtr.add_suppression("Error in Log_event::read_log_event():.*");
133135
CALL mtr.add_suppression("conflict state 7 after post commit");
134136
CALL mtr.add_suppression("Skipped GCache ring buffer recovery");
135137
include/assert_grep.inc [async IST sender starting to serve]
136138
connection node_2;
139+
call mtr.add_suppression("Error in Log_event::read_log_event():.*");
137140
CALL mtr.add_suppression("Skipped GCache ring buffer recovery");
138141
include/assert_grep.inc [Recovering GCache ring buffer: found gapless sequence]

‎mysql-test/suite/galera/r/galera_wsrep_new_cluster.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
connection node_2;
22
connection node_1;
33
connection node_1;
4+
connection node_2;
5+
connection node_2;
6+
Shutting down server ...
7+
connection node_1;
8+
connection node_2;
9+
Cleaning grastate.dat file ...
10+
Starting server ...
11+
connection node_1;
412
SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
513
VARIABLE_VALUE
614
Primary
@@ -38,3 +46,7 @@ VARIABLE_VALUE
3846
SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
3947
VARIABLE_VALUE
4048
Synced
49+
Shutting down server ...
50+
Cleaning var directory ...
51+
Starting server ...
52+
connection node_1;

‎mysql-test/suite/galera/r/partition.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Table Create Table
5757
t1 CREATE TABLE `t1` (
5858
`i` int(10) unsigned NOT NULL AUTO_INCREMENT,
5959
PRIMARY KEY (`i`)
60-
) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=latin1
60+
) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
6161
PARTITION BY RANGE (`i`)
6262
(PARTITION `p1` VALUES LESS THAN (10) ENGINE = InnoDB,
6363
PARTITION `p2` VALUES LESS THAN (20) ENGINE = InnoDB,
@@ -67,7 +67,7 @@ Table Create Table
6767
p1 CREATE TABLE `p1` (
6868
`i` int(10) unsigned NOT NULL AUTO_INCREMENT,
6969
PRIMARY KEY (`i`)
70-
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1
70+
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
7171
SELECT * FROM test.t1;
7272
i
7373
19
@@ -94,7 +94,7 @@ Table Create Table
9494
t1 CREATE TABLE `t1` (
9595
`i` int(10) unsigned NOT NULL AUTO_INCREMENT,
9696
PRIMARY KEY (`i`)
97-
) ENGINE=InnoDB DEFAULT CHARSET=latin1
97+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
9898
PARTITION BY RANGE (`i`)
9999
(PARTITION `p1` VALUES LESS THAN (10) ENGINE = InnoDB,
100100
PARTITION `pMax` VALUES LESS THAN MAXVALUE ENGINE = InnoDB)
@@ -106,7 +106,7 @@ Table Create Table
106106
t1 CREATE TABLE `t1` (
107107
`i` int(10) unsigned NOT NULL AUTO_INCREMENT,
108108
PRIMARY KEY (`i`)
109-
) ENGINE=InnoDB DEFAULT CHARSET=latin1
109+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
110110
PARTITION BY RANGE (`i`)
111111
(PARTITION `p1` VALUES LESS THAN (10) ENGINE = InnoDB,
112112
PARTITION `pMax` VALUES LESS THAN MAXVALUE ENGINE = InnoDB)

0 commit comments

Comments
 (0)