diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-04-01 12:45:16 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-04-01 12:45:16 +0500 |
| commit | db628b97a5aef69413b9b429e36c4872897e5693 (patch) | |
| tree | ef837bf4fdaa936bc57607d203b03ebdf06a0a26 /include | |
| parent | c7db0a813cdf91855b885c6d9bf85e12716d8e00 (diff) | |
| download | mariadb-git-db628b97a5aef69413b9b429e36c4872897e5693.tar.gz | |
Some optimization in CHARSET_INFO:
We don't need separate hash_sort() and hash_caseup()
We don't need tosort(). strnxfrm will do the same.
Diffstat (limited to 'include')
| -rw-r--r-- | include/hash.h | 4 | ||||
| -rw-r--r-- | include/m_ctype.h | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/hash.h b/include/hash.h index 0635d2fd7fc..6c805bc2da7 100644 --- a/include/hash.h +++ b/include/hash.h @@ -25,9 +25,6 @@ extern "C" { typedef byte *(*hash_get_key)(const byte *,uint*,my_bool); typedef void (*hash_free_key)(void *); - /* flags for hash_init */ -#define HASH_CASE_INSENSITIVE 1 - typedef struct st_hash_info { uint next; /* index to next key */ byte *data; /* data for current entry */ @@ -40,7 +37,6 @@ typedef struct st_hash { DYNAMIC_ARRAY array; /* Place for hash_keys */ hash_get_key get_key; void (*free)(void *); - uint (*calc_hashnr)(CHARSET_INFO *cs, const byte *key,uint length); CHARSET_INFO *charset; } HASH; diff --git a/include/m_ctype.h b/include/m_ctype.h index 29ea40eaf33..f6a70d72c19 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -147,7 +147,6 @@ typedef struct charset_info_st void (*casedn_str)(struct charset_info_st *, char *); void (*caseup)(struct charset_info_st *, char *, uint); void (*casedn)(struct charset_info_st *, char *, uint); - void (*tosort)(struct charset_info_st *, char *, uint); /* Functions for case comparison */ int (*strcasecmp)(struct charset_info_st *, const char *, const char *); @@ -155,7 +154,6 @@ typedef struct charset_info_st uint); /* Hash calculation */ - uint (*hash_caseup)(struct charset_info_st *cs, const byte *key, uint len); void (*hash_sort)(struct charset_info_st *cs, const uchar *key, uint len, ulong *nr1, ulong *nr2); @@ -218,9 +216,6 @@ extern int my_strnncoll_simple(CHARSET_INFO *, const uchar *, uint, extern int my_strnncollsp_simple(CHARSET_INFO *, const uchar *, uint, const uchar *, uint); -extern uint my_hash_caseup_simple(CHARSET_INFO *cs, - const byte *key, uint len); - extern void my_hash_sort_simple(CHARSET_INFO *cs, const uchar *key, uint len, ulong *nr1, ulong *nr2); @@ -231,7 +226,6 @@ extern void my_caseup_str_8bit(CHARSET_INFO *, char *); extern void my_casedn_str_8bit(CHARSET_INFO *, char *); extern void my_caseup_8bit(CHARSET_INFO *, char *, uint); extern void my_casedn_8bit(CHARSET_INFO *, char *, uint); -extern void my_tosort_8bit(CHARSET_INFO *, char *, uint); extern int my_strcasecmp_8bit(CHARSET_INFO * cs, const char *, const char *); extern int my_strncasecmp_8bit(CHARSET_INFO * cs, const char *, const char *, @@ -344,7 +338,6 @@ uint my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, uint pos); #define my_caseup(s, a, l) ((s)->caseup((s), (a), (l))) #define my_casedn(s, a, l) ((s)->casedn((s), (a), (l))) -#define my_tosort(s, a, l) ((s)->tosort((s), (a), (l))) #define my_caseup_str(s, a) ((s)->caseup_str((s), (a))) #define my_casedn_str(s, a) ((s)->casedn_str((s), (a))) #define my_strcasecmp(s, a, b) ((s)->strcasecmp((s), (a), (b))) |