Merge bb-10.2-ext into 10.3

Author: dr-m

extra/mariabackup/xtrabackup.cc

@@ -4044,7 +4044,7 @@ xb_space_create_file(
 	const page_size_t page_size(flags);
 
 	if (!page_size.is_compressed()) {
-		buf_flush_init_for_writing(NULL, page, NULL, 0, false);
+		buf_flush_init_for_writing(NULL, page, NULL, 0);
 
 		ret = os_file_write(IORequestWrite, path, *file, page, 0,
 				    UNIV_PAGE_SIZE);
@@ -4061,7 +4061,7 @@ xb_space_create_file(
 			page_zip.m_end = page_zip.m_nonempty =
 			page_zip.n_blobs = 0;
 
-		buf_flush_init_for_writing(NULL, page, &page_zip, 0, false);
+		buf_flush_init_for_writing(NULL, page, &page_zip, 0);
 
 		ret = os_file_write(IORequestWrite, path, *file,
 				    page_zip.data, 0, zip_size);

mysql-test/lib/My/Tee.pm

@@ -1,4 +1,5 @@
 package My::Tee;
+use IO::Handle;
 
 # see PerlIO::via
 
@@ -16,6 +17,7 @@ sub WRITE
 {
  my ($obj, $buf, $fh) = @_;
  print $fh $buf;
+ $fh->flush;
  print $copyfh $buf;
  return length($buf);
 }

mysql-test/r/query_cache.result

@@ -2168,6 +2168,25 @@ show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	1
 drop table t1;
+#
+# MDEV-15328: MariaDB 10.2.13 Crashes upon CALL PROCEDURE PARAM
+# LAST_INSERT_ID ()
+# (part 2, part 1 is in sp.test)
+#
+create table t1 (a int);
+insert into t1 values (1);
+CREATE FUNCTION foo (i INT UNSIGNED ) RETURNS int deterministic  RETURN 1;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	0
+SELECT foo( LAST_INSERT_ID() ) from t1;
+foo( LAST_INSERT_ID() )
+1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	0
+DROP FUNCTION foo;
+drop table t1;
 restore defaults
 SET GLOBAL query_cache_type= default;
 SET GLOBAL query_cache_size= default;

mysql-test/r/sp.result

@@ -8337,6 +8337,14 @@ drop procedure p1;
 drop procedure p2;
 drop procedure p3;
 #
+# MDEV-15328: MariaDB 10.2.13 Crashes upon CALL PROCEDURE PARAM
+# LAST_INSERT_ID ()
+# (part 1, part 2 is in query_cache.test)
+#
+CREATE PROCEDURE foo ( IN i INT UNSIGNED ) BEGIN END;
+CALL foo( LAST_INSERT_ID() );
+DROP PROCEDURE foo;
+#
 # Start of 10.3 tests
 #
 #

mysql-test/r/type_decimal.result

@@ -1020,6 +1020,22 @@ cast('-0.0' as decimal(5,1)) < 0
 # End of 5.5 tests
 #
 #
+# Start of 10.2 tests
+#
+#
+# MDEV-15420 Wrong result for CAST from TIME or DATETIME with zero integer part and non-zero microseconds to DECIMAL(X,Y)
+#
+SET sql_mode='';
+SELECT
+CAST(TIMESTAMP'0000-00-00 00:00:00.123456' AS DECIMAL(10,6)) AS c1,
+CAST(TIME'00:00:00.123456' AS DECIMAL(10,6)) AS c2;
+c1	c2
+0.123456	0.123456
+SET sql_mode=DEFAULT;
+#
+# End of 10.2 tests
+#
+#
 # Start of 10.3 tests
 #
 #

mysql-test/r/warnings.result

@@ -358,3 +358,15 @@ Error	1062	Duplicate entry '11' for key 'a'
 
 DROP TABLE t1;
 DROP FUNCTION f1;
+connect  con1,localhost,root,,;
+SELECT TIME('10:10:10.11111111111');
+TIME('10:10:10.11111111111')
+10:10:10.111111
+Warnings:
+Note	1292	Truncated incorrect time value: '10:10:10.11111111111'
+disconnect con1;
+connect  con2,localhost,root,,;
+SHOW WARNINGS;
+Level	Code	Message
+disconnect con2;
+connection default;

mysql-test/r/xa.result

@@ -323,3 +323,24 @@ XA ROLLBACK 'xid1';
 connection default;
 DROP TABLE t1, t2;
 disconnect con2;
+CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t2 (pk INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t2 VALUES (1),(2);
+CREATE TABLE t3 (i INT) ENGINE=InnoDB;
+XA BEGIN 'xid1';
+REPLACE INTO t1 SELECT * FROM t2;
+connect  con1,localhost,root,,test;
+XA BEGIN 'xid2';
+INSERT INTO t1 SELECT * FROM t2;
+connection default;
+REPLACE INTO t2 SELECT * FROM t2;
+connection con1;
+disconnect con1;
+connect  con2,localhost,root,,test;
+INSERT INTO t3 VALUES (1);
+XA BEGIN 'xid3';
+disconnect con2;
+connection default;
+XA END 'xid1';
+XA ROLLBACK 'xid1';
+DROP TABLE t1, t2, t3;

mysql-test/suite/encryption/disabled.def

@@ -13,4 +13,4 @@
 innodb_scrub            : MDEV-8139 scrubbing does not work reliably
 innodb_scrub_background : MDEV-8139 scrubbing does not work reliably
 innodb-redo-badkey : MDEV-13893 / MDEV-12699 Improve crash recovery of corrupted data pages
-innodb_encryption-page-compression : MDEV-14814 wait condition timeout
+

mysql-test/suite/encryption/r/innodb-discard-import.result

@@ -129,6 +129,6 @@ NOT FOUND /barfoo/ in t2.ibd
 # t3 yes on expecting NOT FOUND
 NOT FOUND /tmpres/ in t3.ibd
 # t4 yes on expecting NOT FOUND
-NOT FOUND /mysql/ in t4.ibd
+# MDEV-15527 FIXME: Enable this test!
 DROP PROCEDURE innodb_insert_proc;
 DROP TABLE t1,t2,t3,t4;

mysql-test/suite/encryption/r/innodb_encryption-page-compression.result

@@ -1,6 +1,4 @@
-SET GLOBAL innodb_file_per_table = ON;
 SET GLOBAL innodb_encryption_threads = 4;
-SET GLOBAL innodb_encrypt_tables = on;
 set global innodb_compression_algorithm = 1;
 create table innodb_normal (c1 int, b char(20)) engine=innodb;
 show warnings;
@@ -166,7 +164,6 @@ innodb_page_compressed7, innodb_page_compressed8,
 innodb_page_compressed9 for export;
 unlock tables;
 # Wait until dirty pages are compressed and encrypted 2
-unlock tables;
 SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
 variable_value > 0
 1