database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-11-17 18:15:13 +02:00
parent 83a55670a6 bbf0b55c17
commit fabdad6857
5 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/galera/r/MDEV-24063.result
View File

@ -1,5 +1,7 @@
connection node_2; connection node_2;
connection node_1; connection node_1;
connection node_1;
connection node_2;
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
connection node_2a; connection node_2a;
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);

6
mysql-test/suite/galera/t/MDEV-24063.test
View File

@ -8,6 +8,10 @@
--source include/galera_cluster.inc --source include/galera_cluster.inc
--let $node_1=node_1
--let $node_2=node_2
--source include/auto_increment_offset_save.inc
--connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
--connection node_2a --connection node_2a
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); CREATE TABLE t1 (f1 INTEGER PRIMARY KEY);
@ -18,3 +22,5 @@ SET GLOBAL wsrep_on=OFF;
--source include/start_mysqld.inc --source include/start_mysqld.inc
DROP TABLE t1; DROP TABLE t1;
--source include/auto_increment_offset_restore.inc

6
mysql-test/suite/maria/repair.test
View File

@ -1,3 +1,9 @@
# We should not run this test with embedded as we are using
# max_session_mem_used, which causes things to fail/not fail randomly
# as memory usage is different compared to normal server.
--source include/not_embedded.inc
# #
# MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename) || share->last_version' failed upon select from I_S # MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename) || share->last_version' failed upon select from I_S
# #

2
mysql-test/suite/perfschema/t/nesting.test
View File

@ -9,6 +9,8 @@
# event, which changes the test output. # event, which changes the test output.
--source include/not_windows.inc --source include/not_windows.inc
--source include/no_protocol.inc --source include/no_protocol.inc
# Work around MDEV-24232: WSREP causes extra operations on LOCK_thd_data etc.
--source include/have_wsrep.inc
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
--disable_query_log --disable_query_log

8
sql/structs.h
View File

@ -874,7 +874,13 @@ public:
Timeval(my_time_t sec, ulong usec) Timeval(my_time_t sec, ulong usec)
{ {
tv_sec= sec; tv_sec= sec;
tv_usec= usec; /*
Since tv_usec is not always of type ulong, cast usec parameter
explicitly to uint to avoid compiler warnings about losing
integer precision.
*/
DBUG_ASSERT(usec < 1000000);
tv_usec= (uint)usec;
} }
explicit Timeval(const timeval &tv) explicit Timeval(const timeval &tv)
:timeval(tv) :timeval(tv)