diff options
| author | monty@mysql.com <> | 2006-02-24 18:34:15 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-02-24 18:34:15 +0200 |
| commit | 82b77cdd901bb36d4be23456bc0c5d171a29e3f7 (patch) | |
| tree | 603ae9081a58d9f7bb204327f65d4a8af4425b28 /mysys | |
| parent | b11c033f496eccc680c1026a57af836c9a4578f3 (diff) | |
| download | mariadb-git-82b77cdd901bb36d4be23456bc0c5d171a29e3f7.tar.gz | |
Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_dirname.c | 2 | ||||
| -rw-r--r-- | mysys/my_bitmap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c index 45bf4d56c31..9206aa28078 100644 --- a/mysys/mf_dirname.c +++ b/mysys/mf_dirname.c @@ -108,7 +108,7 @@ char *convert_dirname(char *to, const char *from, const char *from_end) #if FN_LIBCHAR != '/' || defined(FN_C_BEFORE_DIR_2) { - for (; *from && from != from_end; from++) + for (; from != from_end && *from ; from++) { if (*from == '/') *to++= FN_LIBCHAR; diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index e2875d9e53e..49c23aaeae5 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -40,7 +40,7 @@ #include <my_bitmap.h> #include <m_string.h> -static inline void bitmap_lock(MY_BITMAP *map) +static inline void bitmap_lock(MY_BITMAP *map __attribute__((unused))) { #ifdef THREAD if (map->mutex) @@ -48,7 +48,7 @@ static inline void bitmap_lock(MY_BITMAP *map) #endif } -static inline void bitmap_unlock(MY_BITMAP *map) +static inline void bitmap_unlock(MY_BITMAP *map __attribute__((unused))) { #ifdef THREAD if (map->mutex) |