diff options
Diffstat (limited to 'unittest/mysys')
| -rw-r--r-- | unittest/mysys/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | unittest/mysys/base64-t.c | 12 | ||||
| -rw-r--r-- | unittest/mysys/ma_dyncol-t.c | 2 | ||||
| -rw-r--r-- | unittest/mysys/my_getopt-t.c | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt index ad5195a843e..0c61ff09af2 100644 --- a/unittest/mysys/CMakeLists.txt +++ b/unittest/mysys/CMakeLists.txt @@ -20,8 +20,7 @@ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys) ADD_DEFINITIONS(${SSL_DEFINES}) -MY_ADD_TESTS(ma_dyncol - LINK_LIBRARIES mysqlclient) +MY_ADD_TESTS(ma_dyncol LINK_LIBRARIES mysys) IF(WIN32) MY_ADD_TESTS(my_delete LINK_LIBRARIES mysys) diff --git a/unittest/mysys/base64-t.c b/unittest/mysys/base64-t.c index a3a37976da6..abbc028917d 100644 --- a/unittest/mysys/base64-t.c +++ b/unittest/mysys/base64-t.c @@ -48,18 +48,18 @@ main(int argc __attribute__((unused)),char *argv[]) } /* Encode */ - needed_length= base64_needed_encoded_length(src_len); + needed_length= my_base64_needed_encoded_length(src_len); str= (char *) malloc(needed_length); for (k= 0; k < needed_length; k++) str[k]= 0xff; /* Fill memory to check correct NUL termination */ - ok(base64_encode(src, src_len, str) == 0, - "base64_encode: size %d", i); + ok(my_base64_encode(src, src_len, str) == 0, + "my_base64_encode: size %d", i); ok(needed_length == strlen(str) + 1, - "base64_needed_encoded_length: size %d", i); + "my_base64_needed_encoded_length: size %d", i); /* Decode */ - dst= (char *) malloc(base64_needed_decoded_length(strlen(str))); - dst_len= base64_decode(str, strlen(str), dst, NULL, 0); + dst= (char *) malloc(my_base64_needed_decoded_length(strlen(str))); + dst_len= my_base64_decode(str, strlen(str), dst, NULL, 0); ok(dst_len == src_len, "Comparing lengths"); cmp= memcmp(src, dst, src_len); 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); } |