Merge 10.5 into 10.6

mysql-test/suite/compat/oracle/r/sp-package.result

@@ -3268,3 +3268,78 @@ a
 This is db1.pkg1.p1
 DROP DATABASE db1;
 DROP DATABASE db2;
+#
+# MDEV-29370 Functions in packages are slow and seems to ignore deterministic
+#
+SET SQL_MODE=ORACLE;
+CREATE TABLE t1 (c1 CHAR(1));
+CREATE FUNCTION f1_deterministic()
+RETURN CHAR(1)
+DETERMINISTIC
+IS
+BEGIN
+RETURN 'X';
+END;
+//
+CREATE FUNCTION f2_not_deterministic()
+RETURN CHAR(1)
+IS
+BEGIN
+RETURN 'X';
+END;
+//
+CREATE PACKAGE pkg1
+IS
+PROCEDURE t1_populate(numrows INTEGER);
+FUNCTION f3_deterministic() RETURN CHAR(1) DETERMINISTIC;
+FUNCTION f4_not_deterministic() RETURN CHAR(1);
+END;
+//
+CREATE PACKAGE BODY pkg1
+IS
+PROCEDURE t1_populate(numrounds INTEGER)
+IS
+i INTEGER;
+BEGIN
+INSERT INTO t1 VALUES('Y');
+FOR i IN 1..numrounds LOOP
+INSERT INTO t1 SELECT * FROM t1;
+END LOOP;
+END;
+FUNCTION f3_deterministic() RETURN CHAR(1) DETERMINISTIC COMMENT 'xxx'
+  IS
+BEGIN
+RETURN 'X';
+END;
+FUNCTION f4_not_deterministic() RETURN CHAR(1)
+IS
+BEGIN
+RETURN 'X';
+END;
+END;
+//
+CALL pkg1.t1_populate(3);
+EXPLAIN EXTENDED SELECT 'Deterministic function', COUNT(*) FROM t1 WHERE c1 = f1_deterministic();
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	8	100.00	Using where
+Warnings:
+Note	1003	select 'Deterministic function' AS "Deterministic function",count(0) AS "COUNT(*)" from "test"."t1" where "test"."t1"."c1" = <cache>("f1_deterministic"())
+EXPLAIN EXTENDED SELECT 'Non-deterministic function', COUNT(*) FROM t1 WHERE c1 = f2_not_deterministic();
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	8	100.00	Using where
+Warnings:
+Note	1003	select 'Non-deterministic function' AS "Non-deterministic function",count(0) AS "COUNT(*)" from "test"."t1" where "test"."t1"."c1" = "f2_not_deterministic"()
+EXPLAIN EXTENDED SELECT 'Deterministic package function', COUNT(*) FROM t1 WHERE c1 = pkg1.f3_deterministic();
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	8	100.00	Using where
+Warnings:
+Note	1003	select 'Deterministic package function' AS "Deterministic package function",count(0) AS "COUNT(*)" from "test"."t1" where "test"."t1"."c1" = <cache>("test"."pkg1"."f3_deterministic"())
+EXPLAIN EXTENDED SELECT 'Non-deterministic package function', COUNT(*) FROM t1 WHERE c1 = pkg1.f4_not_deterministic();
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	8	100.00	Using where
+Warnings:
+Note	1003	select 'Non-deterministic package function' AS "Non-deterministic package function",count(0) AS "COUNT(*)" from "test"."t1" where "test"."t1"."c1" = "test"."pkg1"."f4_not_deterministic"()
+DROP TABLE t1;
+DROP FUNCTION f1_deterministic;
+DROP FUNCTION f2_not_deterministic;
+DROP PACKAGE pkg1;

mysql-test/suite/compat/oracle/t/sp-package.test

@@ -3016,3 +3016,75 @@ CALL db2.pkg1.p2_db1_pkg1_p1;
 
 DROP DATABASE db1;
 DROP DATABASE db2;
+
+
+--echo #
+--echo # MDEV-29370 Functions in packages are slow and seems to ignore deterministic
+--echo #
+
+SET SQL_MODE=ORACLE;
+
+CREATE TABLE t1 (c1 CHAR(1));
+
+DELIMITER //;
+CREATE FUNCTION f1_deterministic()
+RETURN CHAR(1)
+DETERMINISTIC
+IS
+BEGIN
+   RETURN 'X';
+END;
+//
+
+CREATE FUNCTION f2_not_deterministic()
+RETURN CHAR(1)
+IS
+BEGIN
+   RETURN 'X';
+END;
+//
+
+CREATE PACKAGE pkg1
+IS
+  PROCEDURE t1_populate(numrows INTEGER);
+  FUNCTION f3_deterministic() RETURN CHAR(1) DETERMINISTIC;
+  FUNCTION f4_not_deterministic() RETURN CHAR(1);
+END;
+//
+
+CREATE PACKAGE BODY pkg1
+IS
+  PROCEDURE t1_populate(numrounds INTEGER)
+  IS
+    i INTEGER;
+  BEGIN
+    INSERT INTO t1 VALUES('Y');
+    FOR i IN 1..numrounds LOOP
+      INSERT INTO t1 SELECT * FROM t1;
+    END LOOP;
+  END;
+  FUNCTION f3_deterministic() RETURN CHAR(1) DETERMINISTIC COMMENT 'xxx'
+  IS
+  BEGIN
+     RETURN 'X';
+  END;
+  FUNCTION f4_not_deterministic() RETURN CHAR(1)
+  IS
+  BEGIN
+     RETURN 'X';
+  END;
+END;
+//
+DELIMITER ;//
+
+CALL pkg1.t1_populate(3);
+
+EXPLAIN EXTENDED SELECT 'Deterministic function', COUNT(*) FROM t1 WHERE c1 = f1_deterministic();
+EXPLAIN EXTENDED SELECT 'Non-deterministic function', COUNT(*) FROM t1 WHERE c1 = f2_not_deterministic();
+EXPLAIN EXTENDED SELECT 'Deterministic package function', COUNT(*) FROM t1 WHERE c1 = pkg1.f3_deterministic();
+EXPLAIN EXTENDED SELECT 'Non-deterministic package function', COUNT(*) FROM t1 WHERE c1 = pkg1.f4_not_deterministic();
+
+DROP TABLE t1;
+DROP FUNCTION f1_deterministic;
+DROP FUNCTION f2_not_deterministic;
+DROP PACKAGE pkg1;

mysql-test/suite/encryption/r/innochecksum,debug.rdiff

@@ -1,10 +0,0 @@
-@@ -30,6 +30,9 @@
- # Space ID mismatch
- # Restore the original tables
- # Corrupt FIL_DATA+10 (data)
-+# FOUND 1 is expected for both.
-+FOUND 1 /InnoDB: Crash recovery is broken due to insufficient innodb_log_file_size; last checkpoint LSN=\d+, current LSN=\d+\. Shutdown is in progress\..*InnoDB: Crash recovery was broken.*/ in mysqld.1.err
-+FOUND 1 /InnoDB: Crash recovery was broken/ in mysqld.1.err
- # Run innochecksum on t2
- # Run innochecksum on t3
- # Run innochecksum on t6

mysql-test/suite/encryption/t/innochecksum.test

@@ -264,7 +264,7 @@ print FILE pack("H*", "c00lcafedeadb017");
 close FILE or die "close";
 EOF
 
-if ($have_debug) {
+if (0 && $have_debug) { # these messages sometimes fail to appear
 --let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
 --let SEARCH_PATTERN= InnoDB: Crash recovery is broken due to insufficient innodb_log_file_size; last checkpoint LSN=\\d+, current LSN=\\d+\\. Shutdown is in progress\\..*InnoDB: Crash recovery was broken.*
 --echo # FOUND 1 is expected for both.

mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test

@@ -1,4 +1,5 @@
 --source include/not_embedded.inc
+--source include/have_wsrep.inc
 
 #
 # @@global.wsrep_on is not allowed if there

sql/sql_yacc.yy

@@ -19204,6 +19204,7 @@ package_implementation_function_body:
             sp_head *sp= pkg->m_current_routine->sphead;
             thd->lex= pkg->m_current_routine;
             sp->reset_thd_mem_root(thd);
+            sp->set_c_chistics(thd->lex->sp_chistics);
             sp->set_body_start(thd, YYLIP->get_cpp_tok_start());
           }
           sp_body opt_package_routine_end_name
@@ -19222,6 +19223,7 @@ package_implementation_procedure_body:
             sp_head *sp= pkg->m_current_routine->sphead;
             thd->lex= pkg->m_current_routine;
             sp->reset_thd_mem_root(thd);
+            sp->set_c_chistics(thd->lex->sp_chistics);
             sp->set_body_start(thd, YYLIP->get_cpp_tok_start());
           }
           sp_body opt_package_routine_end_name

storage/innobase/log/log0recv.cc

@@ -1175,14 +1175,6 @@ inline void recv_sys_t::trim(const page_id_t page_id, lsn_t lsn)
 			pages.erase(r);
 		}
 	}
-	if (fil_space_t* space = fil_space_get(page_id.space())) {
-		ut_ad(UT_LIST_GET_LEN(space->chain) == 1);
-		fil_node_t* file = UT_LIST_GET_FIRST(space->chain);
-		ut_ad(file->is_open());
-		os_file_truncate(file->name, file->handle,
-				 os_offset_t{page_id.page_no()}
-				 << srv_page_size_shift, true);
-	}
 	DBUG_VOID_RETURN;
 }
 
@@ -3273,7 +3265,17 @@ void recv_sys_t::apply(bool last_batch)
     {
       const trunc& t= truncated_undo_spaces[id];
       if (t.lsn)
-        trim(page_id_t(id + srv_undo_space_id_start, t.pages), t.lsn);
+      {
+        trim(page_id_t(id + srv_undo_space_id_start, 0), t.lsn);
+        if (fil_space_t *space = fil_space_get(id + srv_undo_space_id_start))
+        {
+          ut_ad(UT_LIST_GET_LEN(space->chain) == 1);
+          fil_node_t *file= UT_LIST_GET_FIRST(space->chain);
+          ut_ad(file->is_open());
+          os_file_truncate(file->name, file->handle,
+                           os_offset_t{t.pages} << srv_page_size_shift, true);
+        }
+      }
     }
 
     fil_system.extend_to_recv_size();