Merge remote-tracking branch 'origin/10.3' into 10.4

7 files changed, 16 insertions, 4 deletions

diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c
index 243a451bbda..52e6a08d2f8 100644
--- a/libmysqld/libmysql.c
+++ b/libmysqld/libmysql.c
@@ -1141,6 +1141,7 @@ my_bool STDCALL mysql_embedded(void)
 void my_net_local_init(NET *net)
 {
   net->max_packet=   (uint) net_buffer_length;
+  net->read_timeout= net->write_timeout= 0;
   my_net_set_read_timeout(net, CLIENT_NET_READ_TIMEOUT);
   my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT);
   net->retry_count=  1;
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index 0dad53f8881..451148049f5 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -17,7 +17,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
 
 --echo Run it again - should say already completed
---replace_result $MYSQL_SERVER_VERSION VERSION
+--replace_regex /upgraded to .*, use/upgraded to VERSION, use/
 --exec $MYSQL_UPGRADE 2>&1
 
 # It should have created a file in the MySQL Servers datadir
diff --git a/mysql-test/main/type_temporal_innodb.result b/mysql-test/main/type_temporal_innodb.result
index 2aad1e02d02..b11ea8476bd 100644
--- a/mysql-test/main/type_temporal_innodb.result
+++ b/mysql-test/main/type_temporal_innodb.result
@@ -173,6 +173,9 @@ ERROR 22007: Truncated incorrect datetime value: '0000-00-00 00:00:00'
 DROP TABLE t1,t2;
 SET sql_mode=DEFAULT;
 #
+# End of 10.3 tests
+#
+#
 # MDEV-19166 Assertion `!is_zero_datetime()' failed in Timestamp_or_zero_datetime::tv
 #
 CREATE TABLE t1 (f TIMESTAMP DEFAULT 0) ENGINE=InnoDB;
diff --git a/mysql-test/main/type_temporal_innodb.test b/mysql-test/main/type_temporal_innodb.test
index b8c7720f8b6..4adaa483ca2 100644
--- a/mysql-test/main/type_temporal_innodb.test
+++ b/mysql-test/main/type_temporal_innodb.test
@@ -82,6 +82,9 @@ CREATE TABLE tbl SELECT * FROM t1 WHERE t1.c1 = (SELECT c2 FROM t2 WHERE pk = 6)
 DROP TABLE t1,t2;
 SET sql_mode=DEFAULT;
 
+--echo #
+--echo # End of 10.3 tests
+--echo #
 
 --echo #
 --echo # MDEV-19166 Assertion `!is_zero_datetime()' failed in Timestamp_or_zero_datetime::tv
@@ -92,7 +95,6 @@ INSERT INTO t1 VALUES ('2024-02-29');
 SELECT * FROM t1 WHERE SUBSTR(1 FROM BIT_LENGTH(f) FOR DEFAULT(f));
 DROP TABLE t1;
 
-
 --echo #
 --echo # End of 10.4 tests
 --echo #
diff --git a/mysql-test/suite/csv/read_only.test b/mysql-test/suite/csv/read_only.test
index 2af209182d0..a3c851a6a70 100644
--- a/mysql-test/suite/csv/read_only.test
+++ b/mysql-test/suite/csv/read_only.test
@@ -1,3 +1,4 @@
+--source include/not_as_root.inc
 #
 # MDEV-11883 MariaDB crashes with out-of-memory when query information_schema
 #
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 89cc3f8da64..afc2f121167 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -2021,8 +2021,8 @@ int READ_INFO::read_xml(THD *thd)
       
     case '=': /* attribute name end - read the value */
       //check for tag field and attribute name
-      if(!memcmp(tag.c_ptr_safe(), STRING_WITH_LEN("field")) &&
-         !memcmp(attribute.c_ptr_safe(), STRING_WITH_LEN("name")))
+      if(!strcmp(tag.c_ptr_safe(), "field") &&
+         !strcmp(attribute.c_ptr_safe(), "name"))
       {
         /*
           this is format <field name="xx">xx</field>
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 4aeb4bbd193..f95ef7480dd 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -1622,6 +1622,8 @@ buf_chunk_init(
 		return(NULL);
 	}
 
+        MEM_MAKE_ADDRESSABLE(chunk->mem, chunk->mem_size());
+
 #ifdef HAVE_LIBNUMA
 	if (srv_numa_interleave) {
 		struct bitmask *numa_mems_allowed = numa_get_mems_allowed();
@@ -2888,6 +2890,9 @@ withdraw_retry:
 			while (chunk < echunk) {
 				buf_block_t*	block = chunk->blocks;
 
+                                MEM_MAKE_ADDRESSABLE(chunk->mem,
+                                                     chunk->mem_size());
+
 				for (ulint j = chunk->size;
 				     j--; block++) {
 					buf_block_free_mutexes(block);