Skip to content

Commit 5079975

Browse files
dr-mdr-m
committed
Merge 11.0 into 11.1
2 parents d470ed6 + d8b8adc commit 5079975

40 files changed

+232
-260
lines changed

‎include/my_pthread.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,10 +673,10 @@ extern void my_mutex_end(void);
673673
by GCC 12.3.0, GCC 13.2.0, or clang 16.0.6
674674
would fail ./mtr main.1st when the stack size is 5 MiB.
675675
The minimum is more than 6 MiB for CMAKE_BUILD_TYPE=RelWithDebInfo and
676-
more than 8 MiB for CMAKE_BUILD_TYPE=Debug.
676+
more than 10 MiB for CMAKE_BUILD_TYPE=Debug.
677677
Let us add some safety margin.
678678
*/
679-
# define DEFAULT_THREAD_STACK (10L<<20)
679+
# define DEFAULT_THREAD_STACK (11L<<20)
680680
# else
681681
# define DEFAULT_THREAD_STACK (292*1024L) /* 299008 */
682682
# endif

‎mysql-test/main/type_timestamp.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,7 @@ t1 CREATE TABLE `t1` (
13701370
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
13711371
drop table t1;
13721372
#
1373-
# End of 10.10 tests
1373+
# End of 10.5 tests
13741374
#
13751375
#
13761376
# MDEV-32203 Raise notes when an index cannot be used on data type mismatch
@@ -1491,3 +1491,4 @@ indexed_col not_indexed_col
14911491
DROP TABLE t2;
14921492
DROP TABLE t1;
14931493
SET note_verbosity=DEFAULT;
1494+
# End of 10.6 tests

‎mysql-test/main/type_timestamp.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ show create table t1;
921921
drop table t1;
922922

923923
--echo #
924-
--echo # End of 10.10 tests
924+
--echo # End of 10.5 tests
925925
--echo #
926926

927927
--echo #
@@ -941,3 +941,5 @@ DELIMITER ;$$
941941
--source unusable_keys_joins.inc
942942
DROP TABLE t1;
943943
SET note_verbosity=DEFAULT;
944+
945+
--echo # End of 10.6 tests

‎mysql-test/suite/encryption/r/corrupted_during_recovery.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ INSERT INTO t2 VALUES(2);
99
SELECT * FROM t1;
1010
ERROR 42000: Unknown storage engine 'InnoDB'
1111
SELECT * FROM t1;
12-
ERROR HY000: Table test/t1 is corrupted. Please drop the table and recreate.
12+
Got one of the listed errors
1313
SELECT * FROM t2;
1414
a
1515
2

‎mysql-test/suite/encryption/t/corrupted_during_recovery.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ call mtr.add_suppression("Table .*t1.* is corrupted. Please drop the table and r
6060
let $restart_parameters=--innodb_force_recovery=1 --skip-innodb-buffer-pool-load-at-startup;
6161
--source include/restart_mysqld.inc
6262

63-
--error ER_TABLE_CORRUPT
63+
--error ER_NO_SUCH_TABLE_IN_ENGINE,ER_TABLE_CORRUPT
6464
SELECT * FROM t1;
6565
SELECT * FROM t2;
6666
CHECK TABLE t2;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ mdev-31285 : MDEV-25089 Assertion `error.len > 0' failed in galera::ReplicatorSM
2929
galera_var_ignore_apply_errors : MENT-1997 galera_var_ignore_apply_errors test freezes
3030
MW-402 : temporarily disabled at the request of Codership
3131
MDEV-22232 : temporarily disabled at the request of Codership
32+
galera_desync_overlapped : MDEV-21538 galera_desync_overlapped MTR failed: Result content mismatch

‎mysql-test/suite/galera/r/MDEV-31272.result

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
connection node_2;
2+
connection node_1;
3+
connection node_1;
4+
CREATE TABLE t1 (f1 int primary key, f2 int);
5+
INSERT INTO t1 VALUES (1,0);
6+
BEGIN;
7+
INSERT INTO t1 VALUES (2,4),(1,1);
8+
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
9+
COMMIT;
10+
Writesets replicated (expect 0)
11+
0
12+
connection node_1;
13+
SELECT * FROM t1;
14+
f1 f2
15+
1 0
16+
connection node_2;
17+
SELECT * FROM t1;
18+
f1 f2
19+
1 0
20+
DROP TABLE t1;
21+
connection node_1;
22+
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INTEGER);
23+
INSERT INTO t1 VALUES (1,0);
24+
INSERT INTO t1 VALUES (2,4), (1,1);
25+
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
26+
Writesets replicated (expect 0)
27+
0
28+
connection node_1;
29+
SELECT * FROM t1;
30+
f1 f2
31+
1 0
32+
connection node_2;
33+
SELECT * FROM t1;
34+
f1 f2
35+
1 0
36+
DROP TABLE t1;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,19 @@ Killing server ...
100100
connection node_1;
101101
Killing server ...
102102
connection node_1_insert_simple;
103-
ERROR HY000: Lost connection to server during query
103+
Got one of the listed errors
104104
connection node_1_insert_multi;
105-
ERROR HY000: Lost connection to server during query
105+
Got one of the listed errors
106106
connection node_1_insert_transaction;
107-
ERROR HY000: Lost connection to server during query
107+
Got one of the listed errors
108108
connection node_1_update_simple;
109-
ERROR HY000: Lost connection to server during query
109+
Got one of the listed errors
110110
connection node_1_insert_1k;
111-
ERROR HY000: Lost connection to server during query
111+
Got one of the listed errors
112112
connection node_1_insert_1m;
113-
ERROR HY000: Lost connection to server during query
113+
Got one of the listed errors
114114
connection node_1_insert_10m;
115-
ERROR HY000: Lost connection to server during query
115+
Got one of the listed errors
116116
connection node_1;
117117
Performing --wsrep-recover ...
118118
Using --wsrep-start-position when starting mysqld ...

‎mysql-test/suite/galera/t/MDEV-22232.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SET DEBUG_SYNC = 'create_table_select_before_create SIGNAL may_alter WAIT_FOR bf
2828
--connection node_1
2929
SET DEBUG_SYNC = 'now WAIT_FOR may_alter';
3030
--disable_result_log
31-
--error ER_ERROR_ON_RENAME
31+
--error ER_CANT_DROP_FIELD_OR_KEY
3232
ALTER TABLE t1 DROP FOREIGN KEY b, ALGORITHM=COPY;
3333
--enable_result_log
3434

‎mysql-test/suite/galera/t/MDEV-31272.combinations

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[binlogon]
2+
log-bin
3+
log-slave-updates=ON
4+
5+
[binlogoff]

‎mysql-test/suite/galera/t/MDEV-31272.test

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#
2+
# MDEV-31272: Statement rollback causes empty writeset replication
3+
#
4+
5+
--source include/galera_cluster.inc
6+
7+
#
8+
# Case 1: Multi statement transaction
9+
#
10+
--connection node_1
11+
CREATE TABLE t1 (f1 int primary key, f2 int);
12+
INSERT INTO t1 VALUES (1,0);
13+
14+
--let $replicated_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_replicated'`
15+
16+
BEGIN;
17+
--error ER_DUP_ENTRY
18+
INSERT INTO t1 VALUES (2,4),(1,1);
19+
COMMIT;
20+
21+
--let $replicated_new = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_replicated'`
22+
23+
--disable_query_log
24+
--eval SELECT $replicated_new - $replicated_old AS 'Writesets replicated (expect 0)';
25+
--enable_query_log
26+
27+
--connection node_1
28+
SELECT * FROM t1;
29+
--connection node_2
30+
SELECT * FROM t1;
31+
32+
DROP TABLE t1;
33+
34+
35+
#
36+
# Case 2: autocommit statement
37+
#
38+
--connection node_1
39+
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INTEGER);
40+
INSERT INTO t1 VALUES (1,0);
41+
42+
--let $replicated_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_replicated'`
43+
44+
--error ER_DUP_ENTRY
45+
INSERT INTO t1 VALUES (2,4), (1,1);
46+
47+
--let $replicated_new = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_replicated'`
48+
49+
--disable_query_log
50+
--eval SELECT $replicated_new - $replicated_old AS 'Writesets replicated (expect 0)';
51+
--enable_query_log
52+
53+
--connection node_1
54+
SELECT * FROM t1;
55+
--connection node_2
56+
SELECT * FROM t1;
57+
58+
DROP TABLE t1;

‎mysql-test/suite/galera/t/galera_gcache_recover_manytrx.test

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,31 +142,31 @@ SET SESSION wsrep_sync_wait = 0;
142142
--source include/kill_galera.inc
143143

144144
--connection node_1_insert_simple
145-
--error 2013
145+
--error 2013, 2026
146146
--reap
147147

148148
--connection node_1_insert_multi
149-
--error 2013
149+
--error 2013, 2026
150150
--reap
151151

152152
--connection node_1_insert_transaction
153-
--error 2013
153+
--error 2013, 2026
154154
--reap
155155

156156
--connection node_1_update_simple
157-
--error 2013
157+
--error 2013, 2026
158158
--reap
159159

160160
--connection node_1_insert_1k
161-
--error 2013
161+
--error 2013, 2026
162162
--reap
163163

164164
--connection node_1_insert_1m
165-
--error 2013
165+
--error 2013, 2026
166166
--reap
167167

168168
--connection node_1_insert_10m
169-
--error 2013
169+
--error 2013, 2026
170170
--reap
171171

172172
--connection node_1

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212

1313
galera_2_cluster : MDEV-32631 galera_2_cluster: before_rollback(): Assertion `0' failed
1414
galera_gtid_2_cluster : MDEV-32633 galera_gtid_2_cluster: Assertion `thd->wsrep_next_trx_id() != (0x7fffffffffffffffLL * 2ULL + 1)'
15-
galera_ipv6_mariabackup : MDEV-24097
16-
galera_ipv6_mariabackup_section : MDEV-24097, MDEV-22195
17-
galera_vote_rejoin_mysqldump : MDEV-24481: galera_3nodes.galera_vote_rejoin_mysqldump MTR failed: mysql_shutdown failed
1815
galera_ssl_reload : MDEV-32778 galera_ssl_reload failed with warning message
1916
galera_ipv6_mariabackup : temporarily disabled at the request of Codership
2017
galera_pc_bootstrap : temporarily disabled at the request of Codership

‎mysql-test/suite/galera_3nodes/r/galera_vote_rejoin_mysqldump.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ SELECT VARIABLE_VALUE AS expect_Disconnected FROM INFORMATION_SCHEMA.GLOBAL_STAT
3939
expect_Disconnected
4040
Disconnected
4141
SET SESSION wsrep_on=ON;
42+
SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
43+
expect_3
44+
3
4245
SELECT VARIABLE_VALUE AS expect_Primary FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
4346
expect_Primary
4447
Primary
@@ -49,17 +52,11 @@ t1 CREATE TABLE `t1` (
4952
`f1` int(11) DEFAULT NULL
5053
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
5154
connection node_2;
52-
SET SESSION wsrep_on=OFF;
53-
SET SESSION wsrep_on=ON;
54-
# restart
5555
SHOW CREATE TABLE t1;
5656
Table Create Table
5757
t1 CREATE TABLE `t1` (
5858
`f1` int(11) DEFAULT NULL
5959
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
60-
SELECT COUNT(*) AS expect_0 FROM t1;
61-
expect_0
62-
0
6360
CALL mtr.add_suppression("is inconsistent with group");
6461
connection node_3;
6562
SHOW CREATE TABLE t1;
@@ -71,13 +68,16 @@ DROP TABLE t1;
7168
CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'PRIMARY'; check that column/key exists'");
7269
connection node_1;
7370
connection node_1;
74-
CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
71+
CALL mtr.add_suppression("Slave SQL: Error 'The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
7572
DROP USER sst;
7673
connection node_2;
77-
CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
74+
CALL mtr.add_suppression("Slave SQL: Error 'The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement' on query");
7875
CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found");
7976
CALL mtr.add_suppression("Can't open and lock time zone table");
8077
CALL mtr.add_suppression("Can't open and lock privilege tables");
8178
CALL mtr.add_suppression("Info table is not ready to be used");
8279
CALL mtr.add_suppression("Native table .* has the wrong structure");
8380
CALL mtr.add_suppression("Table \'mysql.gtid_slave_pos\' doesn\'t exist");
81+
connection node_2;
82+
# restart
83+
connection node_1;

‎mysql-test/suite/galera_3nodes/t/galera_vote_rejoin_mysqldump.test

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ SET SESSION wsrep_on=ON;
5959
--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
6060
--source include/wait_condition.inc
6161

62+
SELECT VARIABLE_VALUE AS expect_3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
6263
SELECT VARIABLE_VALUE AS expect_Primary FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
6364

6465
# Confirm that the table is now identical throughout
@@ -67,18 +68,7 @@ SELECT VARIABLE_VALUE AS expect_Primary FROM INFORMATION_SCHEMA.GLOBAL_STATUS WH
6768
SHOW CREATE TABLE t1;
6869

6970
--connection node_2
70-
SET SESSION wsrep_on=OFF;
71-
--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
72-
--source include/wait_condition.inc
73-
--source include/galera_wait_ready.inc
74-
SET SESSION wsrep_on=ON;
75-
76-
# restart node so we don't fail on WSREP_START_POSITION internal check
77-
--source include/restart_mysqld.inc
78-
--source include/wait_until_connected_again.inc
79-
8071
SHOW CREATE TABLE t1;
81-
SELECT COUNT(*) AS expect_0 FROM t1;
8272
CALL mtr.add_suppression("is inconsistent with group");
8373

8474
--connection node_3
@@ -89,5 +79,14 @@ CALL mtr.add_suppression("Slave SQL: Error 'Can't DROP 'PRIMARY'; check that col
8979
--connection node_1
9080
--source suite/galera/include/galera_sst_restore.inc
9181

82+
--connection node_2
83+
# restart node so we don't fail on WSREP_START_POSITION internal check
84+
--source include/restart_mysqld.inc
85+
--source include/wait_until_connected_again.inc
86+
87+
--connection node_1
88+
--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
89+
--source include/wait_condition.inc
90+
9291
# Restore original auto_increment_offset values.
9392
--source ../galera/include/auto_increment_offset_restore.inc

‎mysql-test/suite/galera_3nodes_sr/r/GCF-832.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SET SESSION wsrep_trx_fragment_size=1;
1212
START TRANSACTION;
1313
INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary');
1414
COMMIT;
15-
ERROR HY000: Lost connection to server during query
15+
Got one of the listed errors
1616
# restart
1717
connection node_1;
1818
SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;

‎mysql-test/suite/galera_3nodes_sr/t/GCF-832.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SET SESSION wsrep_trx_fragment_size=1;
2626
START TRANSACTION;
2727

2828
INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary');
29-
--error 2013
29+
--error 2013,2026
3030
COMMIT;
3131

3232
--source include/start_mysqld.inc

‎mysql-test/suite/galera_sr/r/MDEV-27615.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SET DEBUG_SYNC='now WAIT_FOR before_fragment';
1515
SET GLOBAL wsrep_cluster_address = '';
1616
SET DEBUG_SYNC = 'now SIGNAL continue';
1717
connection node_2;
18-
ERROR HY000: Lost connection to server during query
18+
Got one of the listed errors
1919
connection node_2a;
2020
SELECT * FROM mysql.wsrep_streaming_log;
2121
node_uuid trx_id seqno flags frag

‎mysql-test/suite/galera_sr/t/MDEV-27615.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ SET DEBUG_SYNC = 'now SIGNAL continue';
4343
# Disconnect causes connection to node_2 to be closed
4444
#
4545
--connection node_2
46-
--error 2013 # CR_SERVER_LOST
46+
# CR_SERVER_LOST, CR_SSL_CONNECTION_ERROR
47+
--error 2013,2026
4748
--reap
4849

4950

‎mysql-test/suite/galera_sr/t/MDEV-28971.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ INSERT INTO t1 VALUES ('AAF');
1515
SELECT SETVAL (SEQ, 100);
1616
ALTER TABLE t1 ADD CONSTRAINT constraint_1 UNIQUE (a);
1717
INSERT INTO t1 VALUES();
18-
--error ER_KEY_COLUMN_DOES_NOT_EXITS
18+
--error ER_KEY_COLUMN_DOES_NOT_EXIST
1919
ALTER TABLE t1 ADD KEY(b (50));
2020
DROP TABLE t1,SEQ;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@
1111
##############################################################################
1212

1313

14-
mdev_6832: wsrep_provider is read-only for security reasons
15-
MDEV-23092: wsrep_provider is read-only for security reasons
16-
wsrep_variables_no_provider: wsrep_provider is read-only for security reasons
17-
MDEV-22443: it is no longer allowed enable wsrep_on if wsrep_provider is 'none'

‎mysql-test/suite/wsrep/r/MDEV-22443.result

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)