database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-02-11 09:26:53 +02:00
parent bfb4761ca0 c7edbe5bb1
commit b19ec8848c
67 changed files with 403 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/mysys/my_getopt-t.c
View File

@@ -61,7 +61,7 @@ static struct my_option mopts_options[]=
};
my_bool dummy_get_one_option(const struct my_option *opt __attribute__((unused)),
char *argument __attribute__((unused)),
const char *argument __attribute__((unused)),
const char *filename __attribute__((unused)))
{
return FALSE;
@@ -235,7 +235,7 @@ static struct my_option auto_options[]=
my_bool auto_get_one_option(const struct my_option *opt,
char *argument,
const char *argument,
const char *filename __attribute__((unused)))
{
if (argument == autoset_my_option)