diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-11 09:26:53 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-02-11 09:26:53 +0200 |
commit | b19ec8848c9463b86d62601dffb67c75e3dfbd70 (patch) | |
tree | 203f6bf23338813575214c23a8fee5a99f7ca2fb /unittest | |
parent | bfb4761ca04704d68dba51f76d7c9967f880a6ee (diff) | |
parent | c7edbe5bb1222634adb0c45ca86c62fb544ce246 (diff) | |
download | mariadb-git-b19ec8848c9463b86d62601dffb67c75e3dfbd70.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'unittest')
-rw-r--r-- | unittest/mysys/my_getopt-t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mysys/my_getopt-t.c b/unittest/mysys/my_getopt-t.c index fb0922b88f8..4b50468ac3f 100644 --- a/unittest/mysys/my_getopt-t.c +++ b/unittest/mysys/my_getopt-t.c @@ -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) |