diff options
| author | unknown <ingo@mysql.com> | 2006-03-03 16:29:42 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-03-03 16:29:42 +0100 |
| commit | 6dcecacf621deec563b14398901c99d83ce0ca9b (patch) | |
| tree | 8818dddaa5af23441c31bc86f4330884d8400143 /mysys | |
| parent | 5001e0a3f73b89b3f0af4139d4aa6a83d08d4c4f (diff) | |
| parent | 9f2d21f695a4fff2716d3fb6e811a19541e9391f (diff) | |
| download | mariadb-git-6dcecacf621deec563b14398901c99d83ce0ca9b.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug11527
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) |