diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 17:16:29 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 17:16:29 -0300 |
| commit | 60ab2b9283ffc6a7c4eeb5f94963c504d6eb8062 (patch) | |
| tree | 6e64b324e47ec067c848617b8ea8340fde01d8b2 /storage/myisam | |
| parent | 72fbf95e5d92cd1c50e76707c39908bfa3de3aa0 (diff) | |
| download | mariadb-git-60ab2b9283ffc6a7c4eeb5f94963c504d6eb8062.tar.gz | |
WL#5498: Remove dead and unused source code
Remove unused macros or macro which are always defined.
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ft_boolean_search.c | 2 | ||||
| -rw-r--r-- | storage/myisam/ft_nlq_search.c | 3 | ||||
| -rw-r--r-- | storage/myisam/mi_write.c | 5 | ||||
| -rw-r--r-- | storage/myisam/myisamchk.c | 1 |
4 files changed, 4 insertions, 7 deletions
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c index 33c1e092a00..b54b4c6ce49 100644 --- a/storage/myisam/ft_boolean_search.c +++ b/storage/myisam/ft_boolean_search.c @@ -92,6 +92,8 @@ static double *nwghts=_nwghts+5; /* nwghts[i] = -0.5*1.5**i */ #define FTB_FLAG_NO 4 #define FTB_FLAG_WONLY 8 +#define CMP_NUM(a,b) (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1) + typedef struct st_ftb_expr FTB_EXPR; struct st_ftb_expr { diff --git a/storage/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c index 7d9b13b7714..937bb6ffe19 100644 --- a/storage/myisam/ft_nlq_search.c +++ b/storage/myisam/ft_nlq_search.c @@ -197,7 +197,8 @@ static int walk_and_push(FT_SUPERDOC *from, static int FT_DOC_cmp(void *unused __attribute__((unused)), FT_DOC *a, FT_DOC *b) { - return sgn(b->weight - a->weight); + double c= b->weight - a->weight; + return ((c < 0) ? -1 : (c > 0) ? 1 : 0); } diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c index f2d43585eef..bd56bb04f65 100644 --- a/storage/myisam/mi_write.c +++ b/storage/myisam/mi_write.c @@ -61,11 +61,6 @@ int mi_write(MI_INFO *info, uchar *record) if (_mi_readinfo(info,F_WRLCK,1)) DBUG_RETURN(my_errno); dont_break(); /* Dont allow SIGHUP or SIGINT */ -#if !defined(NO_LOCKING) && defined(USE_RECORD_LOCK) - if (!info->locked && my_lock(info->dfile,F_WRLCK,0L,F_TO_EOF, - MYF(MY_SEEK_NOT_DONE) | info->lock_wait)) - goto err; -#endif filepos= ((share->state.dellink != HA_OFFSET_ERROR && !info->append_insert_at_end) ? share->state.dellink : diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 6cc3ef9081b..4df76e31872 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -27,7 +27,6 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -SET_STACK_SIZE(9000) /* Minimum stack size for program */ static uint decode_bits; static char **default_argv; |