diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/heap.h | 1 | ||||
| -rw-r--r-- | include/m_ctype.h | 5 | ||||
| -rw-r--r-- | include/m_string.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/heap.h b/include/heap.h index cb73b07cd41..c5f2be81fb7 100644 --- a/include/heap.h +++ b/include/heap.h @@ -51,7 +51,6 @@ typedef struct st_heapinfo /* Struct from heap_info */ uint reclength; /* Length of one record */ int errkey; ulonglong auto_increment; - my_bool implicit_emptied; } HEAPINFO; diff --git a/include/m_ctype.h b/include/m_ctype.h index 88c3418fc0d..247b2220920 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -111,7 +111,7 @@ typedef struct my_collation_handler_st uchar *, uint, const uchar *, uint); my_bool (*like_range)(struct charset_info_st *, const char *s, uint s_length, - int w_prefix, int w_one, int w_many, + pchar w_prefix, pchar w_one, pchar w_many, uint res_length, char *min_str, char *max_str, uint *min_len, uint *max_len); @@ -300,7 +300,7 @@ void my_fill_8bit(CHARSET_INFO *cs, char* to, uint l, int fill); my_bool my_like_range_simple(CHARSET_INFO *cs, const char *ptr, uint ptr_length, - int escape, int w_one, int w_many, + pbool escape, pbool w_one, pbool w_many, uint res_length, char *min_str, char *max_str, uint *min_length, uint *max_length); @@ -381,6 +381,7 @@ extern my_bool my_parse_charset_xml(const char *bug, uint len, #define my_isvar(s,c) (my_isalnum(s,c) || (c) == '_') #define my_isvar_start(s,c) (my_isalpha(s,c) || (c) == '_') +#define my_binary_compare(s) ((s)->state & MY_CS_BINSORT) #define use_strnxfrm(s) ((s)->state & MY_CS_STRNXFRM) #define my_strnxfrm(s, a, b, c, d) ((s)->coll->strnxfrm((s), (a), (b), (c), (d))) #define my_strnncoll(s, a, b, c, d) ((s)->coll->strnncoll((s), (a), (b), (c), (d))) diff --git a/include/m_string.h b/include/m_string.h index d72342fb3c1..5db7158f110 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -126,7 +126,7 @@ extern void bmove_align(gptr dst,const gptr src,uint len); #include <assert.h> #define memcpy_overlap(A,B,C) \ DBUG_ASSERT((A) == (B) || ((A)+(C)) <= (B) || ((B)+(C)) <= (A)); \ -bmove((byte*) key,(byte*) from,(size_t) length); +bmove((byte*) (A),(byte*) (B),(size_t) (C)); #else #define memcpy_overlap(A,B,C) memcpy((A), (B), (C)) #endif /* HAVE_purify */ |