Skip to content

Commit e3d692a

Browse files
dr-mdr-m
committed
Merge 10.2 into 10.3
2 parents 88d22f0 + 620ea81 commit e3d692a

File tree

135 files changed

+1982
-579
lines changed

Some content is hidden

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

135 files changed

+1982
-579
lines changed

‎cmake/check_linker_flag.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ FUNCTION(MY_CHECK_AND_SET_LINKER_FLAG flag_to_set)
66
RETURN()
77
ENDIF()
88
STRING(REGEX REPLACE "[-,= +]" "_" result "HAVE_LINK_FLAG_${flag_to_set}")
9-
SET(SAVE_CMAKE_REQUIRED_LINK_OPTIONS "${CMAKE_REQUIRED_LINK_OPTIONS}")
9+
SET(SAVE_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
1010
STRING(REGEX REPLACE "^-Wno-" "-W" flag_to_check ${flag_to_set})
11-
SET(CMAKE_REQUIRED_LINK_OPTIONS ${CMAKE_REQUIRED_LINK_OPTIONS} ${flag_to_check})
11+
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${flag_to_check})
1212
CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${result})
13-
SET(CMAKE_REQUIRED_LINK_OPTIONS "${SAVE_CMAKE_REQUIRED_LINK_OPTIONS}")
13+
SET(CMAKE_REQUIRED_LIBRARIES "${SAVE_CMAKE_REQUIRED_LIBRARIES}")
1414
IF (${result})
1515
FOREACH(linktype SHARED MODULE EXE)
1616
IF(ARGN)

‎extra/mariabackup/xtrabackup.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2364,7 +2364,7 @@ check_if_skip_database(
23642364
if (databases_exclude_hash &&
23652365
find_filter_in_hashtable(name, databases_exclude_hash,
23662366
&database) &&
2367-
!database->has_tables) {
2367+
(!database->has_tables || !databases_include_hash)) {
23682368
/* Database is found and there are no tables specified,
23692369
skip entire db. */
23702370
return DATABASE_SKIP;
@@ -2720,7 +2720,7 @@ static lsn_t xtrabackup_copy_log(lsn_t start_lsn, lsn_t end_lsn, bool last)
27202720
scanned_lsn += data_len;
27212721
} else if (data_len
27222722
>= OS_FILE_LOG_BLOCK_SIZE - LOG_BLOCK_TRL_SIZE
2723-
|| data_len <= LOG_BLOCK_HDR_SIZE) {
2723+
|| data_len < LOG_BLOCK_HDR_SIZE) {
27242724
/* We got a garbage block (abrupt end of the log). */
27252725
msg(0,"garbage block: " LSN_PF ",%zu",scanned_lsn, data_len);
27262726
break;

‎man/mysqlimport.1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ all would be imported into a table named
5757
patient\&.
5858
.PP
5959
.PP
60-
\fBmysqldump\fR
60+
\fBmysqlimport\fR
6161
supports the following options, which can be specified on the command line or in the
62-
[mysqldump]
62+
[mysqlimport]
6363
and
6464
[client]
6565
option file groups\&.
66-
\fBmysqldump\fR
66+
\fBmysqlimport\fR
6767
also supports the options for processing option files\&.
6868
.sp
6969
.RS 4
@@ -267,17 +267,17 @@ Empty the table before importing the text file\&.
267267
.sp -1
268268
.IP \(bu 2.3
269269
.\}
270-
.\" mysqldump: fields-terminated-by option
271-
.\" fields-terminated-by option: mysqldump
270+
.\" mysqlimport: fields-terminated-by option
271+
.\" fields-terminated-by option: mysqlimport
272272
\fB\-\-fields\-terminated\-by=\&.\&.\&.\fR,
273-
.\" mysqldump: fields-enclosed-by option
274-
.\" fields-enclosed-by option: mysqldump
273+
.\" mysqlimport: fields-enclosed-by option
274+
.\" fields-enclosed-by option: mysqlimport
275275
\fB\-\-fields\-enclosed\-by=\&.\&.\&.\fR,
276-
.\" mysqldump: fields-optionally-enclosed-by option
277-
.\" fields-optionally-enclosed-by option: mysqldump
276+
.\" mysqlimport: fields-optionally-enclosed-by option
277+
.\" fields-optionally-enclosed-by option: mysqlimport
278278
\fB\-\-fields\-optionally\-enclosed\-by=\&.\&.\&.\fR,
279-
.\" mysqldump: fields-escaped-by option
280-
.\" fields-escaped-by option: mysqldump
279+
.\" mysqlimport: fields-escaped-by option
280+
.\" fields-escaped-by option: mysqlimport
281281
\fB\-\-fields\-escaped\-by=\&.\&.\&.\fR
282282
.sp
283283
These options have the same meaning as the corresponding clauses for
@@ -379,8 +379,8 @@ lines of the data file\&.
379379
.sp -1
380380
.IP \(bu 2.3
381381
.\}
382-
.\" mysqldump: lines-terminated-by option
383-
.\" lines-terminated-by option: mysqldump
382+
.\" mysqlimport: lines-terminated-by option
383+
.\" lines-terminated-by option: mysqlimport
384384
\fB\-\-lines\-terminated\-by=\&.\&.\&.\fR
385385
.sp
386386
This option has the same meaning as the corresponding clause for

‎mysql-test/include/galera_have_debug_sync.inc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
--disable_query_log
2+
3+
--let $galera_have_debug_sync = `SELECT 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters'`
4+
5+
--if (!$galera_have_debug_sync) {
6+
--skip Test requires Galera debug library with debug_sync functionality
7+
}
8+
9+
--enable_query_log

‎mysql-test/include/icp_debug_kill.inc

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
--source include/have_debug.inc
2+
--source include/have_debug_sync.inc
3+
--source include/count_sessions.inc
4+
5+
--disable_warnings
6+
drop table if exists t0,t1,t2;
7+
--enable_warnings
8+
9+
create table t0(a int primary key);
10+
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
11+
12+
create table t1(a int primary key);
13+
insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C;
14+
15+
create table t2 (
16+
kp1 int,
17+
kp2 int,
18+
col char(100),
19+
key(kp1, kp2)
20+
);
21+
insert into t2 select a, a, a from t1;
22+
23+
select engine from information_schema.tables
24+
where table_schema=database() and table_name='t2';
25+
26+
explain
27+
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
28+
29+
let $target_id= `select connection_id()`;
30+
31+
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
32+
send
33+
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
34+
35+
connect (con1, localhost, root,,);
36+
connection con1;
37+
set debug_sync='now WAIT_FOR at_icp_check';
38+
evalp kill query $target_id;
39+
set debug_sync='now SIGNAL go';
40+
41+
connection default;
42+
43+
--error ER_QUERY_INTERRUPTED
44+
reap;
45+
set debug_sync='RESET';
46+
47+
disconnect con1;
48+
drop table t0,t1,t2;
49+
--source include/wait_until_count_sessions.inc
50+

‎mysql-test/include/mtr_check.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ BEGIN
3535
AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP'
3636
AND variable_name not like 'GTID%POS'
3737
AND variable_name != 'GTID_BINLOG_STATE'
38+
AND variable_name != 'THREAD_POOL_SIZE'
3839
ORDER BY variable_name;
3940

4041
-- Dump all databases, there should be none

‎mysql-test/main/alter_table.result

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,6 +2517,17 @@ t2 CREATE TABLE `t2` (
25172517
) ENGINE=InnoDB DEFAULT CHARSET=latin1
25182518
DROP TABLE t2, t1;
25192519
#
2520+
# MDEV-18163: Assertion `table_share->tmp_table != NO_TMP_TABLE ||
2521+
# m_lock_type != 2' failed in handler::ha_rnd_next(); / Assertion
2522+
# `table_list->table' failed in find_field_in_table_ref / ERROR 1901
2523+
# (on optimized builds)
2524+
#
2525+
CREATE TABLE t1 (k1 varchar(10) DEFAULT 5);
2526+
CREATE TABLE t2 (i1 int);
2527+
ALTER TABLE t1 ALTER COLUMN k1 SET DEFAULT (SELECT 1 FROM t2 limit 1);
2528+
ERROR HY000: Function or expression 'select ...' cannot be used in the DEFAULT clause of `k1`
2529+
DROP TABLE t1,t2;
2530+
#
25202531
# End of 10.2 tests
25212532
#
25222533
#

‎mysql-test/main/alter_table.test

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,6 +2036,20 @@ ALTER TABLE t2 DROP CONSTRAINT PRIMARY KEY;
20362036
SHOW CREATE TABLE t2;
20372037
DROP TABLE t2, t1;
20382038

2039+
--echo #
2040+
--echo # MDEV-18163: Assertion `table_share->tmp_table != NO_TMP_TABLE ||
2041+
--echo # m_lock_type != 2' failed in handler::ha_rnd_next(); / Assertion
2042+
--echo # `table_list->table' failed in find_field_in_table_ref / ERROR 1901
2043+
--echo # (on optimized builds)
2044+
--echo #
2045+
2046+
2047+
CREATE TABLE t1 (k1 varchar(10) DEFAULT 5);
2048+
CREATE TABLE t2 (i1 int);
2049+
--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
2050+
ALTER TABLE t1 ALTER COLUMN k1 SET DEFAULT (SELECT 1 FROM t2 limit 1);
2051+
DROP TABLE t1,t2;
2052+
20392053
--echo #
20402054
--echo # End of 10.2 tests
20412055
--echo #

‎mysql-test/main/aria_icp_debug.result

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
set default_storage_engine=aria;
2+
drop table if exists t0,t1,t2;
3+
create table t0(a int primary key);
4+
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
5+
create table t1(a int primary key);
6+
insert into t1 select A.a + B.a* 10 + C.a * 100 from t0 A, t0 B, t0 C;
7+
create table t2 (
8+
kp1 int,
9+
kp2 int,
10+
col char(100),
11+
key(kp1, kp2)
12+
);
13+
insert into t2 select a, a, a from t1;
14+
select engine from information_schema.tables
15+
where table_schema=database() and table_name='t2';
16+
engine
17+
Aria
18+
explain
19+
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
20+
id select_type table type possible_keys key key_len ref rows Extra
21+
1 SIMPLE t2 range kp1 kp1 5 NULL 10 Using index condition
22+
set debug_sync='handler_index_cond_check SIGNAL at_icp_check WAIT_FOR go';
23+
select * from t2 where kp1 between 10 and 20 and kp2 +1 >100;
24+
connect con1, localhost, root,,;
25+
connection con1;
26+
set debug_sync='now WAIT_FOR at_icp_check';
27+
kill query $target_id;
28+
set debug_sync='now SIGNAL go';
29+
connection default;
30+
ERROR 70100: Query execution was interrupted
31+
set debug_sync='RESET';
32+
disconnect con1;
33+
drop table t0,t1,t2;
34+
set default_storage_engine=default;

‎mysql-test/main/aria_icp_debug.test

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
set default_storage_engine=aria;
3+
--source include/icp_debug_kill.inc
4+
set default_storage_engine=default;
5+

0 commit comments

Comments
 (0)