Skip to content

Commit d058be6

Browse files
sysprgsysprg
committed
Merge branch '10.6' into '10.11'
2 parents 984606d + a50a5e0 commit d058be6

Some content is hidden

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

51 files changed

+678
-135
lines changed

‎client/mysql.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,8 @@ static struct my_option my_long_options[] =
18171817
"if the output is suspended. Doesn't use history file.",
18181818
&quick, &quick, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
18191819
{"quick-max-column-width", 0,
1820-
"Maximal field length limit in case of --qick", &quick_max_column_width,
1820+
"Maximum number of characters displayed in a column header"
1821+
" when using --quick", &quick_max_column_width,
18211822
&quick_max_column_width, 0, GET_ULONG, REQUIRED_ARG, LONG_MAX, 0, ULONG_MAX,
18221823
0, 1, 0},
18231824
{"raw", 'r', "Write fields without conversion. Used with --batch.",

‎mysql-test/main/client.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ insert into t1 values ("01234", "0123456789", "01234567890123456789", "1");
5858
+-----------+------------+----------------------+------+
5959
drop table t1;
6060
#
61-
# End of 10.7 tests
61+
# End of 10.5 tests
6262
#

‎mysql-test/main/client.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ insert into t1 values ("01234", "0123456789", "01234567890123456789", "1");
4242
drop table t1;
4343

4444
--echo #
45-
--echo # End of 10.7 tests
45+
--echo # End of 10.5 tests
4646
--echo #

‎mysql-test/main/having_cond_pushdown.result

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5815,4 +5815,14 @@ HAVING (SELECT MAX(b) FROM t1) = a AND a > b;
58155815
a b
58165816
2 1
58175817
DROP TABLE t1;
5818+
#
5819+
# MDEV-25084: Moving equality with constant right side
5820+
# from HAVING to WHERE
5821+
# (fixed by the patch for MDEV-26402)
5822+
#
5823+
CREATE TABLE t1 (a CHAR(3)) CHARSET=sjis;
5824+
INSERT INTO t1 VALUES ('foo'),('bar');
5825+
SELECT LOAD_FILE('') AS f, a FROM t1 GROUP BY f, a HAVING f = a;
5826+
f a
5827+
DROP TABLE t1;
58185828
End of 10.5 tests

‎mysql-test/main/having_cond_pushdown.test

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,4 +1588,16 @@ eval $q;
15881588

15891589
DROP TABLE t1;
15901590

1591+
1592+
--echo #
1593+
--echo # MDEV-25084: Moving equality with constant right side
1594+
--echo # from HAVING to WHERE
1595+
--echo # (fixed by the patch for MDEV-26402)
1596+
--echo #
1597+
1598+
CREATE TABLE t1 (a CHAR(3)) CHARSET=sjis;
1599+
INSERT INTO t1 VALUES ('foo'),('bar');
1600+
SELECT LOAD_FILE('') AS f, a FROM t1 GROUP BY f, a HAVING f = a;
1601+
DROP TABLE t1;
1602+
15911603
--echo End of 10.5 tests

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

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

1313
galera_as_slave_ctas : MDEV-28378 timeout
1414
galera_pc_recovery : MDEV-25199 cluster fails to start up
15-
galera_bf_kill_debug : timeout after 900 seconds
16-
galera_ssl_upgrade : [Warning] Failed to load slave replication state from table mysql.gtid_slave_pos: 130: Incorrect file format 'gtid_slave_pos'
17-
galera_parallel_simple : timeout related to wsrep_sync_wait
18-
galera_insert_bulk : MDEV-30536 no expected deadlock in galera_insert_bulk test
1915
galera_sequences : MDEV-32561 WSREP FSM failure: no such a transition REPLICATING -> COMMITTED
2016
galera_concurrent_ctas : MDEV-32779 galera_concurrent_ctas: assertion in the galera::ReplicatorSMM::finish_cert()
2117
galera_as_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback()

‎mysql-test/suite/galera/include/galera_wsrep_recover.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ if (!$wsrep_recover_additional)
1010

1111
--perl
1212
use strict;
13-
my $wsrep_start_position_str = "grep 'WSREP: Recovered position:' $ENV{MYSQL_TMP_DIR}/galera_wsrep_recover.log | sed 's/.*WSREP\:\ Recovered\ position://' | sed 's/^[ \t]*//'";
14-
my $wsrep_start_position = `grep 'WSREP: Recovered position:' $ENV{MYSQL_TMP_DIR}/galera_wsrep_recover.log | sed 's/.*WSREP\:\ Recovered\ position://' | sed 's/^[ \t]*//'`;
13+
my $wsrep_start_position_str = "grep -a 'WSREP: Recovered position:' $ENV{MYSQL_TMP_DIR}/galera_wsrep_recover.log | sed 's/.*WSREP\:\ Recovered\ position://' | sed 's/^[ \t]*//'";
14+
my $wsrep_start_position = `grep -a 'WSREP: Recovered position:' $ENV{MYSQL_TMP_DIR}/galera_wsrep_recover.log | sed 's/.*WSREP\:\ Recovered\ position://' | sed 's/^[ \t]*//'`;
1515
chomp($wsrep_start_position);
1616

1717
die if $wsrep_start_position eq '';

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ id val
3939
7 d
4040
9 d
4141
11 d
42-
set global wsrep_mode=REPLICATE_MYISAM;
42+
set global wsrep_mode='REPLICATE_MYISAM,REPLICATE_ARIA';
4343
create table t4(id serial, val varchar(100)) engine=myisam;
4444
insert into t4 values(null, 'a');
4545
insert into t4 values(null, 'b');
@@ -95,6 +95,7 @@ id val
9595
4 d
9696
5 d
9797
6 d
98+
set global wsrep_mode=default;
9899
connection node_1;
99100
drop table t1,t2,t3,t4,t5;
100101
set global wsrep_mode=default;

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,19 @@ update t1 set b= 1 where a=1;
2222
connection node_2b;
2323
SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.before_wsrep_thd_abort_reached";
2424
connection node_2;
25-
SET DEBUG_SYNC= 'before_awake_no_mutex SIGNAL awake_reached WAIT_FOR continue_kill';
25+
SET DEBUG_SYNC= 'wsrep_kill_before_awake_no_mutex SIGNAL awake_reached WAIT_FOR continue_kill';
2626
connection node_2b;
2727
SET DEBUG_SYNC='now WAIT_FOR awake_reached';
2828
SET GLOBAL debug_dbug = "";
2929
SET DEBUG_SYNC = "now SIGNAL signal.before_wsrep_thd_abort";
30+
connection node_1;
31+
COMMIT;
32+
connection node_2b;
3033
SET DEBUG_SYNC = "now SIGNAL continue_kill";
3134
connection node_2;
3235
connection node_2a;
3336
select * from t1;
34-
connection node_2;
37+
connection node_2b;
3538
SET DEBUG_SYNC = "RESET";
3639
drop table t1;
3740
disconnect node_2a;

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ connection node_2;
22
connection node_1;
33
connection node_1;
44
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
5+
SET GLOBAL DEBUG_DBUG = 'd,sync.wsrep_apply_cb';
6+
connection node_1;
57
SET foreign_key_checks = 0;
68
SET unique_checks = 0;
79
START TRANSACTION;
@@ -10,11 +12,20 @@ SET foreign_key_checks = 1;
1012
SET unique_checks = 1;
1113
INSERT INTO t1 VALUES (1001);
1214
connection node_1;
15+
SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR sync.wsrep_apply_cb_reached';
16+
SET DEBUG_SYNC = 'wsrep_after_certification SIGNAL signal.wsrep_apply_cb';
1317
COMMIT;
1418
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
1519
DROP TABLE t1;
20+
SET GLOBAL DEBUG_DBUG = '';
21+
SET DEBUG_SYNC = 'RESET';
1622
connection node_1;
1723
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
24+
connection node_2;
25+
SET GLOBAL DEBUG_DBUG = 'd,sync.wsrep_apply_cb';
26+
connection node_1;
27+
SET foreign_key_checks = 0;
28+
SET unique_checks = 0;
1829
START TRANSACTION;
1930
connection node_2;
2031
SET foreign_key_checks = 1;
@@ -23,8 +34,14 @@ START TRANSACTION;
2334
INSERT INTO t1 VALUES (1001);
2435
connection node_1;
2536
COMMIT;
26-
2
37+
3
2738
connection node_2;
39+
SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR sync.wsrep_apply_cb_reached';
40+
SET DEBUG_SYNC = 'wsrep_after_certification SIGNAL signal.wsrep_apply_cb';
2841
COMMIT;
2942
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
3043
DROP TABLE t1;
44+
SET GLOBAL DEBUG_DBUG = '';
45+
SET DEBUG_SYNC = 'RESET';
46+
disconnect node_2;
47+
disconnect node_1;

0 commit comments

Comments
 (0)