diff options
| -rw-r--r-- | mysql-test/suite/galera/r/MDEV-24063.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/MDEV-24063.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/maria/repair.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/nesting.test | 2 | ||||
| -rw-r--r-- | sql/structs.h | 8 |
5 files changed, 23 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/r/MDEV-24063.result b/mysql-test/suite/galera/r/MDEV-24063.result index 757cc07a642..d7eda917cdf 100644 --- a/mysql-test/suite/galera/r/MDEV-24063.result +++ b/mysql-test/suite/galera/r/MDEV-24063.result @@ -1,5 +1,7 @@ connection node_2; connection node_1; +connection node_1; +connection node_2; connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; connection node_2a; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); diff --git a/mysql-test/suite/galera/t/MDEV-24063.test b/mysql-test/suite/galera/t/MDEV-24063.test index 24c5071cb15..9646db5d6d5 100644 --- a/mysql-test/suite/galera/t/MDEV-24063.test +++ b/mysql-test/suite/galera/t/MDEV-24063.test @@ -8,6 +8,10 @@ --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 --connection node_2a CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); @@ -18,3 +22,5 @@ SET GLOBAL wsrep_on=OFF; --source include/start_mysqld.inc DROP TABLE t1; + +--source include/auto_increment_offset_restore.inc diff --git a/mysql-test/suite/maria/repair.test b/mysql-test/suite/maria/repair.test index 9603a949f9b..13165269b76 100644 --- a/mysql-test/suite/maria/repair.test +++ b/mysql-test/suite/maria/repair.test @@ -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 # diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test index dd8b6f6154a..ee1581c284b 100644 --- a/mysql-test/suite/perfschema/t/nesting.test +++ b/mysql-test/suite/perfschema/t/nesting.test @@ -9,6 +9,8 @@ # event, which changes the test output. --source include/not_windows.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 --disable_query_log diff --git a/sql/structs.h b/sql/structs.h index 27acb9e200e..76129f2abf7 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -874,7 +874,13 @@ public: Timeval(my_time_t sec, ulong usec) { 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) :timeval(tv) |