Merge 10.3 into 10.4

extra/mariabackup/xtrabackup.cc

@@ -3794,10 +3794,6 @@ static dberr_t xb_assign_undo_space_start()
 	int		n_retries = 5;
 	ulint		fsp_flags;
 
-	if (srv_undo_tablespaces == 0) {
-		return error;
-	}
-
 	file = os_file_create(0, srv_sys_space.first_datafile()->filepath(),
 		OS_FILE_OPEN, OS_FILE_NORMAL, OS_DATA_FILE, true, &ret);
 

include/my_alarm.h

@@ -31,7 +31,9 @@ extern ulong my_time_to_wait_for_lock;
 #include <signal.h>
 #ifdef HAVE_SIGHANDLER_T
 #define sig_return sighandler_t
-#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__)
+#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) || \
+    defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+    defined(__DragonFly__)
 typedef void (*sig_return)(int); /* Returns type from signal */
 #else
 typedef void (*sig_return)(void); /* Returns type from signal */

man/mysqld_safe.1

@@ -340,7 +340,9 @@ program to set the server\'s scheduling priority to the given value\&.
 .\}
 .\" mysqld_safe: no-auto-restart option
 .\" no-auto-restart option: mysqld_safe
-\fB\-\-no\-auto\-restart\fR
+\fB\-\-no\-auto\-restart\fR,
+\fB\-\-nowatch\fR,
+\fB\-\-no\-watch\fR
 .sp
 Exit after starting mysqld\&.
 .RE
@@ -368,21 +370,6 @@ Do not read any option files\&. This must be the first option on the command lin
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysqld_safe: no-watch option
-.\" no-watch option: mysqld_safe
-\fB\-\-no\-auto\-restart\fR
-.sp
-Exit after starting mysqld\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" mysqld_safe: numa-interleave option
 .\" numa-interleave option: mysqld_safe
 \fB\-\-numa\-interleave\fR

mysql-test/main/order_by_innodb.result

@@ -1,8 +1,8 @@
-drop table if exists t0,t1,t2,t3;
 #
 # MDEV-6434: Wrong result (extra rows) with ORDER BY, multiple-column index, InnoDB
 #
-CREATE TABLE t1 (a INT, b INT, c INT, d TEXT, KEY idx(a,b,c)) ENGINE=InnoDB;
+CREATE TABLE t1 (a INT, b INT, c INT, d TEXT, KEY idx(a,b,c)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
 INSERT INTO t1 (a,c) VALUES
 (8, 9),(8, 10),(13, 15),(16, 17),(16, 18),(16, 19),(20, 21),
 (20, 22),(20, 24),(20, 25),(20, 26),(20, 27),(20, 28);
@@ -14,24 +14,16 @@ DROP TABLE t1;
 #
 # MDEV-9457: Poor query plan chosen for ORDER BY query by a recent 10.1
 #
-create table t0 (a int);
-insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (
 pk int primary key,
 key1 int,
 key2 int,
 col1 char(255),
 key(key1),
 key(key2)
-) engine=innodb;
-set @a=-1;
+) engine=innodb stats_persistent=0;
 insert into t1 
-select 
-@a:=@a+1, 
-@a, 
-@a, 
-repeat('abcd', 63) 
-from t0 A, t0 B, t0 C, t0 D;
+select seq,seq,seq,repeat('abcd', 63) from seq_0_to_9999;
 # The following must NOT use 'index' on PK. 
 # It should use index_merge(key1,key2) + filesort
 explain 
@@ -47,7 +39,7 @@ from t1
 where key1<3 or key2<3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index_merge	key1,key2	key1,key2	5,5	NULL	#	Using sort_union(key1,key2); Using where
-drop table t0, t1;
+drop table t1;
 #
 # MDEV-18094: Query with order by limit picking index scan over filesort
 #
@@ -78,9 +70,12 @@ drop table t1,t0;
 # MDEV-14071: wrong results with orderby_uses_equalities=on
 # (duplicate of MDEV-13994)
 #
-CREATE TABLE t1 (i int, j int, z int,PRIMARY KEY (i,j), KEY (z)) ENGINE=InnoDB;
-CREATE TABLE t2 (i int, j int, PRIMARY KEY (i,j)) ENGINE=InnoDB;
-CREATE TABLE t3 (j int, n varchar(5), PRIMARY KEY (j)) ENGINE=InnoDB;
+CREATE TABLE t1 (i int, j int, z int,PRIMARY KEY (i,j), KEY (z)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
+CREATE TABLE t2 (i int, j int, PRIMARY KEY (i,j)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
+CREATE TABLE t3 (j int, n varchar(5), PRIMARY KEY (j)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
 INSERT INTO t1 VALUES
 (127,0,1),(188,0,1),(206,0,1),(218,0,1),(292,0,1),(338,0,1),(375,0,1),
 (381,0,1),(409,0,1),(466,0,1),(469,0,1),(498,0,1),(656,0,1);
@@ -150,7 +145,8 @@ DROP TABLE t1,t2,t3;
 #
 # MDEV-25858: Query results are incorrect when indexes are added
 #
-CREATE TABLE t1 (id int NOT NULL PRIMARY KEY) engine=innodb;
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY) engine=innodb
+STATS_PERSISTENT=0;
 insert into t1 values (1),(2),(3);
 CREATE TABLE t2 (
 id int NOT NULL PRIMARY KEY,

mysql-test/main/order_by_innodb.test

@@ -2,16 +2,14 @@
 # ORDER BY handling (e.g. filesort) tests that require innodb
 #
 -- source include/have_innodb.inc
-
---disable_warnings
-drop table if exists t0,t1,t2,t3;
---enable_warnings
+-- source include/have_sequence.inc
 
 --echo #
 --echo # MDEV-6434: Wrong result (extra rows) with ORDER BY, multiple-column index, InnoDB
 --echo #
 
-CREATE TABLE t1 (a INT, b INT, c INT, d TEXT, KEY idx(a,b,c)) ENGINE=InnoDB;
+CREATE TABLE t1 (a INT, b INT, c INT, d TEXT, KEY idx(a,b,c)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
 
 INSERT INTO t1 (a,c) VALUES
 (8, 9),(8, 10),(13, 15),(16, 17),(16, 18),(16, 19),(20, 21),
@@ -24,26 +22,17 @@ DROP TABLE t1;
 --echo #
 --echo # MDEV-9457: Poor query plan chosen for ORDER BY query by a recent 10.1
 --echo #
-create table t0 (a int);
-insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-
 create table t1 (
   pk int primary key,
   key1 int,
   key2 int,
   col1 char(255),
   key(key1),
   key(key2)
-) engine=innodb;
+) engine=innodb stats_persistent=0;
 
-set @a=-1;
 insert into t1 
-select 
-  @a:=@a+1, 
-  @a, 
-  @a, 
-  repeat('abcd', 63) 
-from t0 A, t0 B, t0 C, t0 D;
+select seq,seq,seq,repeat('abcd', 63) from seq_0_to_9999;
 
 --echo # The following must NOT use 'index' on PK. 
 --echo # It should use index_merge(key1,key2) + filesort
@@ -60,7 +49,7 @@ select *
 from t1
 where key1<3 or key2<3;
 
-drop table t0, t1;
+drop table t1;
 
 --echo #
 --echo # MDEV-18094: Query with order by limit picking index scan over filesort
@@ -93,9 +82,12 @@ drop table t1,t0;
 --echo # (duplicate of MDEV-13994)
 --echo #
 
-CREATE TABLE t1 (i int, j int, z int,PRIMARY KEY (i,j), KEY (z)) ENGINE=InnoDB;
-CREATE TABLE t2 (i int, j int, PRIMARY KEY (i,j)) ENGINE=InnoDB;
-CREATE TABLE t3 (j int, n varchar(5), PRIMARY KEY (j)) ENGINE=InnoDB;
+CREATE TABLE t1 (i int, j int, z int,PRIMARY KEY (i,j), KEY (z)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
+CREATE TABLE t2 (i int, j int, PRIMARY KEY (i,j)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
+CREATE TABLE t3 (j int, n varchar(5), PRIMARY KEY (j)) ENGINE=InnoDB
+STATS_PERSISTENT=0;
 
 INSERT INTO t1 VALUES
   (127,0,1),(188,0,1),(206,0,1),(218,0,1),(292,0,1),(338,0,1),(375,0,1),
@@ -139,7 +131,8 @@ DROP TABLE t1,t2,t3;
 --echo # MDEV-25858: Query results are incorrect when indexes are added
 --echo #
 
-CREATE TABLE t1 (id int NOT NULL PRIMARY KEY) engine=innodb;
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY) engine=innodb
+STATS_PERSISTENT=0;
 insert into t1 values (1),(2),(3);
 
 CREATE TABLE t2 (

mysql-test/main/range_innodb.result

@@ -1,15 +1,11 @@
 #
 # Range optimizer (and related) tests that need InnoDB.
 # 
-drop table if exists t0, t1, t2;
 #
 # MDEV-6735: Range checked for each record used with key
 #
 create table t0(a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-create table t1(a int);
-insert into t1 select A.a + B.a* 10 + C.a * 100 + D.a * 1000
-from t0 A, t0 B, t0 C, t0 D;
 create table t2 ( 
 a int,
 b int,
@@ -22,12 +18,12 @@ key(b)
 ) engine=innodb;
 insert into t2 
 select 
-a,a,
+seq,seq,
 repeat('0123456789', 10), 
 repeat('0123456789', 10), 
 repeat('0123456789', 10),
 repeat('0123456789', 10)
-from t1;
+from seq_0_to_9999;
 analyze table t2;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	Engine-independent statistics collected
@@ -37,7 +33,7 @@ explain select * from t0 left join t2 on t2.a <t0.a and t2.b between 50 and 250;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	NULL	NULL	NULL	NULL	10	
 1	SIMPLE	t2	range	a,b	b	5	NULL	201	Using where; Using join buffer (flat, BNL join)
-drop table t0,t1,t2;
+drop table t0,t2;
 #
 # MDEV-10466: constructing an invalid SEL_ARG
 #
@@ -89,15 +85,14 @@ drop table t1,t2;
 #
 set @optimizer_switch_save= @@optimizer_switch;
 set optimizer_switch='index_merge_sort_intersection=off';
-create table t0 (a int)engine=innodb;
+create table t0(a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (
 a int, b int, c int,
 key(a),key(b),key(c)
 )engine=innodb;
 insert into t1
-select A.a+10*B.a, A.a+10*B.a, A.a+10*B.a+100*C.a
-from t0 A, t0 B, t0 C, t0 D where D.a<5;
+select a.seq/10, a.seq/10, a.seq from seq_0_to_499 a, seq_0_to_4 b;
 SET @saved_dbug = @@GLOBAL.debug_dbug;
 set @@global.debug_dbug="+d,ha_index_init_fail";
 explain select * from t1 where a=10 and b=10;

mysql-test/main/range_innodb.test

@@ -4,23 +4,16 @@
 
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_sequence.inc
 --source include/no_valgrind_without_big.inc
 
---disable_warnings
-drop table if exists t0, t1, t2;
---enable_warnings
-
 --echo #
 --echo # MDEV-6735: Range checked for each record used with key
 --echo #
 
 create table t0(a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
-create table t1(a int);
-insert into t1 select A.a + B.a* 10 + C.a * 100 + D.a * 1000
-from t0 A, t0 B, t0 C, t0 D;
-
 create table t2 ( 
  a int,
  b int,
@@ -34,18 +27,18 @@ create table t2 (
 
 insert into t2 
 select 
-   a,a,
+   seq,seq,
   repeat('0123456789', 10), 
   repeat('0123456789', 10), 
   repeat('0123456789', 10),
   repeat('0123456789', 10)
-from t1;
+from seq_0_to_9999;
 
 analyze table t2;
 --echo # The following must not use "Range checked for each record":
 explain select * from t0 left join t2 on t2.a <t0.a and t2.b between 50 and 250;
 
-drop table t0,t1,t2;
+drop table t0,t2;
 
 
 --echo #
@@ -98,15 +91,14 @@ drop table t1,t2;
 
 set @optimizer_switch_save= @@optimizer_switch;
 set optimizer_switch='index_merge_sort_intersection=off';
-create table t0 (a int)engine=innodb;
+create table t0(a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (
   a int, b int, c int,
   key(a),key(b),key(c)
 )engine=innodb;
 insert into t1
-select A.a+10*B.a, A.a+10*B.a, A.a+10*B.a+100*C.a
-from t0 A, t0 B, t0 C, t0 D where D.a<5;
+select a.seq/10, a.seq/10, a.seq from seq_0_to_499 a, seq_0_to_4 b;
 SET @saved_dbug = @@GLOBAL.debug_dbug;
 set @@global.debug_dbug="+d,ha_index_init_fail";
 explain select * from t1 where a=10 and b=10;
@@ -122,8 +114,6 @@ set @@optimizer_switch= @optimizer_switch_save;
 --echo # MDEV-27262: Index intersection with full scan over an index
 --echo #
 
---source include/have_sequence.inc
-
 CREATE TABLE t1 (
   id int(10) unsigned NOT NULL AUTO_INCREMENT,
   p char(32) DEFAULT NULL,

mysql-test/suite/innodb_gis/disabled.def

@@ -13,3 +13,4 @@
 rtree_concurrent_srch : MDEV-15284 COUNT(*) mismatch
 rtree_recovery : MDEV-15284 COUNT(*) mismatch
 rtree_compress2 : MDEV-16269 CHECK TABLE reports wrong count
+types : MDEV-22512 recovery runs out of memory before 10.5

mysql-test/suite/innodb_gis/r/alter_spatial_index.result

@@ -795,4 +795,14 @@ ENGINE=InnoDB;
 INSERT INTO t VALUES (REPEAT('MariaDB Corporation Ab ',351),POINT(0,0));
 ALTER TABLE t FORCE;
 DROP TABLE t;
+#
+# MDEV-29856 heap-use-after-poison in row_merge_spatial_rows()
+# with PRIMARY KEY on column prefix
+#
+CREATE TABLE t (id INT, f TEXT, s POINT NOT NULL,
+PRIMARY KEY(id,f(1)), SPATIAL(s)) ENGINE=InnoDB;
+INSERT INTO t VALUES
+(1,REPEAT('x',8192),@p:=ST_GeomFromText('POINT(0 0)')),(2,'',@p);
+ALTER TABLE t FORCE;
+DROP TABLE t;
 # End of 10.3 tests

mysql-test/suite/innodb_gis/t/alter_spatial_index.test

@@ -791,4 +791,16 @@ ALTER TABLE t FORCE;
 # Cleanup
 DROP TABLE t;
 
+--echo #
+--echo # MDEV-29856 heap-use-after-poison in row_merge_spatial_rows()
+--echo # with PRIMARY KEY on column prefix
+--echo #
+
+CREATE TABLE t (id INT, f TEXT, s POINT NOT NULL,
+                PRIMARY KEY(id,f(1)), SPATIAL(s)) ENGINE=InnoDB;
+INSERT INTO t VALUES
+(1,REPEAT('x',8192),@p:=ST_GeomFromText('POINT(0 0)')),(2,'',@p);
+ALTER TABLE t FORCE;
+DROP TABLE t;
+
 --echo # End of 10.3 tests

mysql-test/suite/innodb_zip/disabled.def

@@ -1 +1 @@
-
+recover : MDEV-22512 recovery runs out of memory before 10.5

mysql-test/suite/mariabackup/full_backup.opt

@@ -0,0 +1 @@
+--innodb_undo_tablespaces=2