diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 18:06:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:56 +0200 |
| commit | bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c (patch) | |
| tree | ed6ce95f6ee9ff57b45c494d10f5a19473237e96 /unittest | |
| parent | e3982cead235e9becb1abdbf0e73876c8a6e6b28 (diff) | |
| download | mariadb-git-bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c.tar.gz | |
MDEV-6066: Merge new defaults from 5.6 and 5.7
cosmetic fixes. test fixes.
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/my_getopt-t.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/unittest/mysys/my_getopt-t.c b/unittest/mysys/my_getopt-t.c index 0eff84e8750..c4c26e88624 100644 --- a/unittest/mysys/my_getopt-t.c +++ b/unittest/mysys/my_getopt-t.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, Monty Program Ab +/* Copyright (c) 2015, MariaDB Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -38,7 +38,7 @@ static struct my_option mopts_options[]= {"str", 0, "Something numeric.", &mopts_str, &mopts_str, 0, GET_STR, - REQUIRED_ARG, (ulong)"ddd", 0, 0, 0, 0, 0}, + REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"bool", 0, "Something true or false", &mopts_bool, &mopts_bool, 0, GET_BOOL, @@ -326,6 +326,9 @@ int main(int argc __attribute__((unused)), char **argv) MY_INIT(argv[0]); plan(4*8 + 1*4 + 3*4 + 3*2); + /* gcc 4.1.2 doesn't want it in the initializer, we have to do it run-time */ + mopts_options[0].def_value= (intptr)"ddd"; + test_mopts1(); test_mopts2(); test_mopts3(); |