1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Monty 2020-07-03 20:26:09 +03:00
commit e9f06b19e0
7 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libmysqld/libmysql.c
View File

@ -1141,6 +1141,7 @@ my_bool STDCALL mysql_embedded(void)
void my_net_local_init(NET *net) void my_net_local_init(NET *net)
{ {
net->max_packet= (uint) net_buffer_length; 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_read_timeout(net, CLIENT_NET_READ_TIMEOUT);
my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT); my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT);
net->retry_count= 1; net->retry_count= 1;

2
mysql-test/main/mysql_upgrade.test
View File

@ -17,7 +17,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
file_exists $MYSQLD_DATADIR/mysql_upgrade_info; file_exists $MYSQLD_DATADIR/mysql_upgrade_info;
--echo Run it again - should say already completed --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 --exec $MYSQL_UPGRADE 2>&1
# It should have created a file in the MySQL Servers datadir # It should have created a file in the MySQL Servers datadir

3
mysql-test/main/type_temporal_innodb.result
View File

@ -173,6 +173,9 @@ ERROR 22007: Truncated incorrect datetime value: '0000-00-00 00:00:00'
DROP TABLE t1,t2; DROP TABLE t1,t2;
SET sql_mode=DEFAULT; SET sql_mode=DEFAULT;
# #
# End of 10.3 tests
#
#
# MDEV-19166 Assertion `!is_zero_datetime()' failed in Timestamp_or_zero_datetime::tv # MDEV-19166 Assertion `!is_zero_datetime()' failed in Timestamp_or_zero_datetime::tv
# #
CREATE TABLE t1 (f TIMESTAMP DEFAULT 0) ENGINE=InnoDB; CREATE TABLE t1 (f TIMESTAMP DEFAULT 0) ENGINE=InnoDB;

4
mysql-test/main/type_temporal_innodb.test
View File

@ -82,6 +82,9 @@ CREATE TABLE tbl SELECT * FROM t1 WHERE t1.c1 = (SELECT c2 FROM t2 WHERE pk = 6)
DROP TABLE t1,t2; DROP TABLE t1,t2;
SET sql_mode=DEFAULT; SET sql_mode=DEFAULT;
--echo #
--echo # End of 10.3 tests
--echo #
--echo # --echo #
--echo # MDEV-19166 Assertion `!is_zero_datetime()' failed in Timestamp_or_zero_datetime::tv --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)); SELECT * FROM t1 WHERE SUBSTR(1 FROM BIT_LENGTH(f) FOR DEFAULT(f));
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
--echo # End of 10.4 tests --echo # End of 10.4 tests
--echo # --echo #

1
mysql-test/suite/csv/read_only.test
View File

@ -1,3 +1,4 @@
--source include/not_as_root.inc
# #
# MDEV-11883 MariaDB crashes with out-of-memory when query information_schema # MDEV-11883 MariaDB crashes with out-of-memory when query information_schema
# #

4
sql/sql_load.cc
View File

@ -2021,8 +2021,8 @@ int READ_INFO::read_xml(THD *thd)
case '=': /* attribute name end - read the value */ case '=': /* attribute name end - read the value */
//check for tag field and attribute name //check for tag field and attribute name
if(!memcmp(tag.c_ptr_safe(), STRING_WITH_LEN("field")) && if(!strcmp(tag.c_ptr_safe(), "field") &&
!memcmp(attribute.c_ptr_safe(), STRING_WITH_LEN("name"))) !strcmp(attribute.c_ptr_safe(), "name"))
{ {
/* /*
this is format <field name="xx">xx</field> this is format <field name="xx">xx</field>

5
storage/innobase/buf/buf0buf.cc
View File

@ -1622,6 +1622,8 @@ buf_chunk_init(
return(NULL); return(NULL);
} }
MEM_MAKE_ADDRESSABLE(chunk->mem, chunk->mem_size());
#ifdef HAVE_LIBNUMA #ifdef HAVE_LIBNUMA
if (srv_numa_interleave) { if (srv_numa_interleave) {
struct bitmask *numa_mems_allowed = numa_get_mems_allowed(); struct bitmask *numa_mems_allowed = numa_get_mems_allowed();
@ -2888,6 +2890,9 @@ withdraw_retry:
while (chunk < echunk) { while (chunk < echunk) {
buf_block_t* block = chunk->blocks; buf_block_t* block = chunk->blocks;
MEM_MAKE_ADDRESSABLE(chunk->mem,
chunk->mem_size());
for (ulint j = chunk->size; for (ulint j = chunk->size;
j--; block++) { j--; block++) {
buf_block_free_mutexes(block); buf_block_free_mutexes(block);