From 4dc50758603d6ed2891412fdb6d37cd8b5541999 Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 24 Jun 2016 02:25:14 +0300 Subject: Fixed compiler warnings and test failures found by buildbot Fixed ccfilter to detect errors where the column is included in the error message --- mysys/mulalloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysys/mulalloc.c') diff --git a/mysys/mulalloc.c b/mysys/mulalloc.c index fceecdc1dc7..e230cdf9b71 100644 --- a/mysys/mulalloc.c +++ b/mysys/mulalloc.c @@ -80,7 +80,7 @@ void *my_multi_malloc_large(myf myFlags, ...) { va_list args; char **ptr,*start,*res; - size_t tot_length,length; + ulonglong tot_length,length; DBUG_ENTER("my_multi_malloc"); va_start(args,myFlags); @@ -92,7 +92,7 @@ void *my_multi_malloc_large(myf myFlags, ...) } va_end(args); - if (!(start=(char *) my_malloc(tot_length, myFlags))) + if (!(start=(char *) my_malloc((size_t) tot_length, myFlags))) DBUG_RETURN(0); /* purecov: inspected */ va_start(args,myFlags); -- cgit v1.2.1