diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/base64.c | 4 | ||||
| -rw-r--r-- | mysys/mf_keycache.c | 5 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 1 | ||||
| -rw-r--r-- | mysys/my_init.c | 2 | ||||
| -rw-r--r-- | mysys/my_thr_init.c | 6 | ||||
| -rw-r--r-- | mysys/ptr_cmp.c | 2 |
6 files changed, 13 insertions, 7 deletions
diff --git a/mysys/base64.c b/mysys/base64.c index 6a6b7eae359..47b93942784 100644 --- a/mysys/base64.c +++ b/mysys/base64.c @@ -98,10 +98,10 @@ base64_encode(const void *src, size_t src_len, char *dst) } -static inline unsigned +static inline uint pos(unsigned char c) { - return strchr(base64_table, c) - base64_table; + return (uint) (strchr(base64_table, c) - base64_table); } diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 0762d10ab08..87f136dbf81 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -167,8 +167,10 @@ static void unlink_from_queue(KEYCACHE_WQUEUE *wqueue, struct st_my_thread_var *thread); #endif static void free_block(KEY_CACHE *keycache, BLOCK_LINK *block); +#ifndef DBUG_OFF static void test_key_cache(KEY_CACHE *keycache, const char *where, my_bool lock); +#endif #define KEYCACHE_HASH(f, pos) \ (((ulong) ((pos) >> keycache->key_cache_shift)+ \ @@ -2605,7 +2607,8 @@ static int flush_all_key_blocks(KEY_CACHE *keycache) 0 on success (always because it can't fail) */ -int reset_key_cache_counters(const char *name, KEY_CACHE *key_cache) +int reset_key_cache_counters(const char *name __attribute__((unused)), + KEY_CACHE *key_cache) { DBUG_ENTER("reset_key_cache_counters"); if (!key_cache->key_cache_inited) diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 250c10e8479..623c48b2e55 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -194,6 +194,7 @@ int handle_options(int *argc, char ***argv, Find first the right option. Return error in case of an ambiguous, or unknown option */ + LINT_INIT(prev_found); optp= longopts; if (!(opt_found= findopt(opt_str, length, &optp, &prev_found))) { diff --git a/mysys/my_init.c b/mysys/my_init.c index cc4bef10e8d..2bcf5f44c4d 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -197,7 +197,9 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", } if (!(infoflag & MY_DONT_FREE_DBUG)) + { DBUG_END(); /* Must be done before my_thread_end */ + } #ifdef THREAD my_thread_end(); my_thread_global_end(); diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 67ab1e4a38a..7a5fdbf8ad6 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -54,8 +54,8 @@ pthread_mutexattr_t my_errorcheck_mutexattr; race conditions in NPTL pthread_exit code. */ -static -pthread_handler_t nptl_pthread_exit_hack_handler(void *arg) +static pthread_handler_t +nptl_pthread_exit_hack_handler(void *arg __attribute__((unused))) { /* Do nothing! */ pthread_exit(0); @@ -400,9 +400,9 @@ const char *my_thread_name(void) static uint get_thread_lib(void) { +#ifdef _CS_GNU_LIBPTHREAD_VERSION char buff[64]; -#ifdef _CS_GNU_LIBPTHREAD_VERSION confstr(_CS_GNU_LIBPTHREAD_VERSION, buff, sizeof(buff)); if (!strncasecmp(buff, "NPTL", 4)) diff --git a/mysys/ptr_cmp.c b/mysys/ptr_cmp.c index a3bc3702c34..33c28160a4c 100644 --- a/mysys/ptr_cmp.c +++ b/mysys/ptr_cmp.c @@ -185,7 +185,7 @@ my_off_t my_get_ptr(byte *ptr, uint pack_length) case 3: pos= (my_off_t) mi_uint3korr(ptr); break; case 2: pos= (my_off_t) mi_uint2korr(ptr); break; case 1: pos= (my_off_t) mi_uint2korr(ptr); break; - default: DBUG_ASSERT(0); + default: DBUG_ASSERT(0); return 0; } return pos; } |