diff options
| author | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-10-02 14:19:51 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-10-02 14:19:51 +0200 |
| commit | 0ca2e21b5e0c321786529612e17f3b9b18f449db (patch) | |
| tree | e131d5da5d02ba5a919f150bcc69f87abcad6a92 /include | |
| parent | 04bf9cc7c6f17d9c6ab14a7521c1ab1708f50993 (diff) | |
| parent | 2a6e8817a27278ac811d72d14777f99c7dc80aa7 (diff) | |
| download | mariadb-git-0ca2e21b5e0c321786529612e17f3b9b18f449db.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 54ae41bf2e0..9dbe277bf82 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -205,6 +205,9 @@ typedef struct my_charset_handler_st int *err); longlong (*strtoll10)(struct charset_info_st *cs, const char *nptr, char **endptr, int *error); + ulonglong (*strntoull10rnd)(struct charset_info_st *cs, + const char *str, uint length, int unsigned_fl, + char **endptr, int *error); ulong (*scan)(struct charset_info_st *, const char *b, const char *e, int sq); } MY_CHARSET_HANDLER; @@ -341,6 +344,13 @@ longlong my_strtoll10_8bit(CHARSET_INFO *cs, longlong my_strtoll10_ucs2(CHARSET_INFO *cs, const char *nptr, char **endptr, int *error); +ulonglong my_strntoull10rnd_8bit(CHARSET_INFO *cs, + const char *str, uint length, int unsigned_fl, + char **endptr, int *error); +ulonglong my_strntoull10rnd_ucs2(CHARSET_INFO *cs, + const char *str, uint length, int unsigned_fl, + char **endptr, int *error); + void my_fill_8bit(CHARSET_INFO *cs, char* to, uint l, int fill); my_bool my_like_range_simple(CHARSET_INFO *cs, |