diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:11:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-13 18:11:24 +0200 |
| commit | d7a4ce3c804334914b2431e91d6328945dce6b02 (patch) | |
| tree | 80843b11dd434588a346a10c2fd80ef1681688d7 /plugin | |
| parent | 57737258bee753f85e44010e2f0ce365238c988d (diff) | |
| parent | 25b91c3f13affc1b58169240894b206ff34b1db3 (diff) | |
| download | mariadb-git-d7a4ce3c804334914b2431e91d6328945dce6b02.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/handler_socket/handlersocket/handlersocket.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugin/handler_socket/handlersocket/handlersocket.cpp b/plugin/handler_socket/handlersocket/handlersocket.cpp index 8133497044c..45c9e13b2ca 100644 --- a/plugin/handler_socket/handlersocket/handlersocket.cpp +++ b/plugin/handler_socket/handlersocket/handlersocket.cpp @@ -185,7 +185,9 @@ static SHOW_VAR hs_status_variables[] = { {NullS, NullS, SHOW_LONG} }; -static int show_hs_vars(THD *thd, SHOW_VAR *var, char *buff) +static int show_hs_vars(THD *thd, SHOW_VAR *var, void *buff, + struct system_status_var *status_var, + enum enum_var_type var_type) { var->type= SHOW_ARRAY; var->value= (char *) &hs_status_variables; @@ -193,7 +195,7 @@ static int show_hs_vars(THD *thd, SHOW_VAR *var, char *buff) } static SHOW_VAR daemon_handlersocket_status_variables[] = { - {"Hs", (char*) show_hs_vars, SHOW_FUNC}, + SHOW_FUNC_ENTRY("Hs", &show_hs_vars), {NullS, NullS, SHOW_LONG} }; |