diff options
| author | monty@mysql.com <> | 2006-02-25 21:54:34 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-02-25 21:54:34 +0200 |
| commit | 1e2e9e28565d97f140f230824a1adfcea475ee34 (patch) | |
| tree | 69f6c8a1a1bef870aa8b2cbe729b0fd87fcf1c31 /mysys | |
| parent | 066c7148fb5243a0533fd7b6edfe948cb1722548 (diff) | |
| parent | 54274976e7b4a9a28e94a6f0b4f8d064140248db (diff) | |
| download | mariadb-git-1e2e9e28565d97f140f230824a1adfcea475ee34.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
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 98da72a206c..378fe7080b8 100644 --- a/mysys/mf_dirname.c +++ b/mysys/mf_dirname.c @@ -109,7 +109,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 91575d66368..70edb507b5f 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -84,7 +84,7 @@ void create_last_word_mask(MY_BITMAP *map) } } -static inline void bitmap_lock(MY_BITMAP *map) +static inline void bitmap_lock(MY_BITMAP *map __attribute__((unused))) { #ifdef THREAD if (map->mutex) @@ -92,7 +92,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) |