diff options
| author | serg@serg.mysql.com <> | 2001-10-09 15:23:44 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-10-09 15:23:44 +0200 |
| commit | 9ec4ca9c4d44c23ecbb642bf425b42019b97425d (patch) | |
| tree | 9246142fc630888d9df22974741b24594d61b55a /myisam | |
| parent | 6b6b69c2f78cf6bc20872ce16c81b7f3217e4d7d (diff) | |
| download | mariadb-git-9ec4ca9c4d44c23ecbb642bf425b42019b97425d.tar.gz | |
get rid of comp() macro - CMP is already in place
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_boolean_search.c | 4 | ||||
| -rw-r--r-- | myisam/mi_search.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index 32d8e7941bb..00f3ac8ff0a 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -87,9 +87,9 @@ typedef struct st_ft_info { int FTB_WORD_cmp(void *v, byte *a, byte *b) { /* ORDER BY docid, ndepth DESC */ - int i=comp(((FTB_WORD *)a)->docid, ((FTB_WORD *)b)->docid); + int i=CMP(((FTB_WORD *)a)->docid, ((FTB_WORD *)b)->docid); if (!i) - i=comp(((FTB_WORD *)b)->ndepth,((FTB_WORD *)a)->ndepth); + i=CMP(((FTB_WORD *)b)->ndepth,((FTB_WORD *)a)->ndepth); return i; } diff --git a/myisam/mi_search.c b/myisam/mi_search.c index 67db7c7110a..b0a0b06f499 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -19,8 +19,6 @@ #include "fulltext.h" #include "m_ctype.h" -#define CMP(a,b) (a<b ? -1 : a == b ? 0 : 1) - static my_bool _mi_get_prev_key(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *page, uchar *key, uchar *keypos, uint *return_key_length); |