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 remote-tracking branch 'origin/11.2' into 11.4

Browse source
This commit is contained in:
Alexander Barkov 2024-06-17 14:53:54 +04:00
commit c4bf4ce948
252 changed files with 4067 additions and 1026 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/perfschema/ha_perfschema.cc
View file

@ -133,7 +133,9 @@ static int pfs_done_func(void *p)
DBUG_RETURN(0);
}
static int show_func_mutex_instances_lost(THD *thd, SHOW_VAR *var, char *buff)
static int show_func_mutex_instances_lost(THD *thd, SHOW_VAR *var, void *buff,
struct system_status_var *status_var,
enum enum_var_type)
{
var->type= SHOW_LONG;
var->value= buff;

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

@ -240,6 +240,7 @@ int main(int, char **)
MY_INIT("pfs_noop-t");
test_noop();
my_end(MY_CHECK_ERROR);
return (exit_status());
}