Skip to content

Commit e9f06b1

Browse files
committed
Merge remote-tracking branch 'origin/10.3' into 10.4
2 parents 1bf863a + 4849313 commit e9f06b1

File tree

7 files changed

+16
-4
lines changed

7 files changed

+16
-4
lines changed

libmysqld/libmysql.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,6 +1141,7 @@ my_bool STDCALL mysql_embedded(void)
11411141
void my_net_local_init(NET *net)
11421142
{
11431143
net->max_packet= (uint) net_buffer_length;
1144+
net->read_timeout= net->write_timeout= 0;
11441145
my_net_set_read_timeout(net, CLIENT_NET_READ_TIMEOUT);
11451146
my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT);
11461147
net->retry_count= 1;

mysql-test/main/mysql_upgrade.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
1717
file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
1818

1919
--echo Run it again - should say already completed
20-
--replace_result $MYSQL_SERVER_VERSION VERSION
20+
--replace_regex /upgraded to .*, use/upgraded to VERSION, use/
2121
--exec $MYSQL_UPGRADE 2>&1
2222

2323
# It should have created a file in the MySQL Servers datadir

mysql-test/main/type_temporal_innodb.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ ERROR 22007: Truncated incorrect datetime value: '0000-00-00 00:00:00'
173173
DROP TABLE t1,t2;
174174
SET sql_mode=DEFAULT;
175175
#
176+
# End of 10.3 tests
177+
#
178+
#
176179
# MDEV-19166 Assertion `!is_zero_datetime()' failed in Timestamp_or_zero_datetime::tv
177180
#
178181
CREATE TABLE t1 (f TIMESTAMP DEFAULT 0) ENGINE=InnoDB;

mysql-test/main/type_temporal_innodb.test

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ CREATE TABLE tbl SELECT * FROM t1 WHERE t1.c1 = (SELECT c2 FROM t2 WHERE pk = 6)
8282
DROP TABLE t1,t2;
8383
SET sql_mode=DEFAULT;
8484

85+
--echo #
86+
--echo # End of 10.3 tests
87+
--echo #
8588

8689
--echo #
8790
--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');
9295
SELECT * FROM t1 WHERE SUBSTR(1 FROM BIT_LENGTH(f) FOR DEFAULT(f));
9396
DROP TABLE t1;
9497

95-
9698
--echo #
9799
--echo # End of 10.4 tests
98100
--echo #

mysql-test/suite/csv/read_only.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--source include/not_as_root.inc
12
#
23
# MDEV-11883 MariaDB crashes with out-of-memory when query information_schema
34
#

sql/sql_load.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,8 +2021,8 @@ int READ_INFO::read_xml(THD *thd)
20212021

20222022
case '=': /* attribute name end - read the value */
20232023
//check for tag field and attribute name
2024-
if(!memcmp(tag.c_ptr_safe(), STRING_WITH_LEN("field")) &&
2025-
!memcmp(attribute.c_ptr_safe(), STRING_WITH_LEN("name")))
2024+
if(!strcmp(tag.c_ptr_safe(), "field") &&
2025+
!strcmp(attribute.c_ptr_safe(), "name"))
20262026
{
20272027
/*
20282028
this is format <field name="xx">xx</field>

storage/innobase/buf/buf0buf.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,6 +1622,8 @@ buf_chunk_init(
16221622
return(NULL);
16231623
}
16241624

1625+
MEM_MAKE_ADDRESSABLE(chunk->mem, chunk->mem_size());
1626+
16251627
#ifdef HAVE_LIBNUMA
16261628
if (srv_numa_interleave) {
16271629
struct bitmask *numa_mems_allowed = numa_get_mems_allowed();
@@ -2888,6 +2890,9 @@ buf_pool_resize()
28882890
while (chunk < echunk) {
28892891
buf_block_t* block = chunk->blocks;
28902892

2893+
MEM_MAKE_ADDRESSABLE(chunk->mem,
2894+
chunk->mem_size());
2895+
28912896
for (ulint j = chunk->size;
28922897
j--; block++) {
28932898
buf_block_free_mutexes(block);

0 commit comments

Comments
 (0)