diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 08:26:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 08:26:28 +0300 |
| commit | e3d692aa092a76415ce1ce0e9662338873d84abb (patch) | |
| tree | c6c7fafc561b589f82ed3a0afd696822fd52962d /sql/wsrep_var.cc | |
| parent | 88d22f0e65192ca1b1e69b46661ce57ce19dbaa4 (diff) | |
| parent | 620ea816adeceaba7c875679ab8505f4c07a22b8 (diff) | |
| download | mariadb-git-e3d692aa092a76415ce1ce0e9662338873d84abb.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index f18dc565329..413550935cb 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -724,8 +724,8 @@ static int show_var_cmp(const void *var1, const void *var2) return strcasecmp(((SHOW_VAR*)var1)->name, ((SHOW_VAR*)var2)->name); } -int wsrep_show_status (THD *thd, SHOW_VAR *var, char *buff, - enum enum_var_type scope) +int wsrep_show_status (THD *thd, SHOW_VAR *var, void *buff, + system_status_var *, enum_var_type scope) { uint i, maxi= SHOW_VAR_FUNC_BUFF_SIZE / sizeof(*var) - 1; SHOW_VAR *v= (SHOW_VAR *)buff; |