diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-30 20:47:39 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-30 20:47:39 +0400 |
| commit | 835cbbcc7b797188a89671019f2b2844e1a14e0c (patch) | |
| tree | 010dd112f16b88bb655c32abb6b93987fe5c6c99 /unittest | |
| parent | fe8cf8fdf1c4c0a9ec60690a8d2738fd255c8dd5 (diff) | |
| parent | 003cb2f42477772ae43228c0bc0f8492246b9340 (diff) | |
| download | mariadb-git-835cbbcc7b797188a89671019f2b2844e1a14e0c.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
TODO: enable MDEV-13049 optimization for 10.3
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/ma_dyncol-t.c | 2 | ||||
| -rw-r--r-- | unittest/mysys/my_getopt-t.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mysys/ma_dyncol-t.c b/unittest/mysys/ma_dyncol-t.c index 3b43c10a6a8..124f16e15be 100644 --- a/unittest/mysys/ma_dyncol-t.c +++ b/unittest/mysys/ma_dyncol-t.c @@ -124,7 +124,7 @@ void test_value_single_double(double num, const char *name) if (mariadb_dyncol_get_num(&str, 1, &res)) goto err; rc= (res.type == DYN_COL_DOUBLE) && (res.x.double_value == num); - num= res.x.ulong_value; + num= res.x.double_value; err: ok(rc, "%s - %lf", name, num); /* cleanup */ diff --git a/unittest/mysys/my_getopt-t.c b/unittest/mysys/my_getopt-t.c index 39814d76690..3e16d79424e 100644 --- a/unittest/mysys/my_getopt-t.c +++ b/unittest/mysys/my_getopt-t.c @@ -72,7 +72,7 @@ void run(const char *arg, ...) arg= va_arg(ap, char*); } va_end(ap); - arg_c= arg_v - arg_s; + arg_c= (int)(arg_v - arg_s); arg_v= arg_s; res= handle_options(&arg_c, &arg_v, mopts_options, 0); } |