mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 12:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '11.2' into 11.4

Browse source
This commit is contained in:
Oleksandr Byelkin 2024-05-21 19:38:51 +02:00
commit 99b370e023
1438 changed files with 43012 additions and 14848 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/perfschema/pfs_buffer_container.h
View file

@ -1084,8 +1084,7 @@ template <class T>
class PFS_buffer_processor
{
public:
virtual ~PFS_buffer_processor<T> ()
{}
virtual ~PFS_buffer_processor()= default;
virtual void operator()(T *element) = 0;
};

2
storage/perfschema/pfs_instr_class.cc
View file

@ -55,7 +55,7 @@
Indicate if the performance schema is enabled.
This flag is set at startup, and never changes.
*/
my_bool pfs_enabled= TRUE;
my_bool pfs_enabled= FALSE;
/**
PFS_INSTRUMENT option settings array

2
storage/perfschema/table_replication_applier_status.cc
View file

@ -166,7 +166,7 @@ void table_replication_applier_status::make_row(Master_info *mi)
m_row.service_state= PS_RPL_NO;
m_row.remaining_delay= 0;
if (slave_sql_running_state == Relay_log_info::state_delaying_string)
if (slave_sql_running_state == stage_sql_thd_waiting_until_delay.m_name)
{
time_t t= my_time(0), sql_delay_end= mi->rli.get_sql_delay_end();
m_row.remaining_delay= (uint)(t < sql_delay_end ?

2
storage/perfschema/table_replication_applier_status.h
View file

@ -59,7 +59,7 @@ struct st_row_applier_status {
enum_rpl_yes_no service_state;
uint remaining_delay;
bool remaining_delay_is_set;
ulong count_transactions_retries;
ulonglong count_transactions_retries;
};
/** Table PERFORMANCE_SCHEMA.replication_applier_status */

3
storage/perfschema/unittest/pfs_instr-t.cc
View file

@ -86,6 +86,8 @@ void test_no_instruments()
cleanup_instruments();
}
PRAGMA_DISABLE_CHECK_STACK_FRAME
void test_no_instances()
{
int rc;
@ -245,6 +247,7 @@ void test_no_instances()
cleanup_file_hash();
cleanup_instruments();
}
PRAGMA_REENABLE_CHECK_STACK_FRAME
void test_with_instances()
{

1
storage/perfschema/unittest/pfs_instr_class-t.cc
View file

@ -743,6 +743,7 @@ void do_all_tests()
int main(int argc, char **argv)
{
plan(209);
pfs_enabled= 1;
MY_INIT(argv[0]);
do_all_tests();
my_end(0);