diff options
| author | unknown <bar@mysql.com> | 2005-04-06 11:53:15 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-04-06 11:53:15 +0500 |
| commit | 5687fe36bf21add03b96871215c58bd2e12a4666 (patch) | |
| tree | e7ff1b9199a6be79542bbe6fbdf4588d1e054d48 /include | |
| parent | 81125bc8ceb2de09fb0db1851ca80edb45b290e2 (diff) | |
| download | mariadb-git-5687fe36bf21add03b96871215c58bd2e12a4666.tar.gz | |
Adding a new parameter for well_formed_length to
return error. We'll use it for better warnign reporting.
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 26e285b9683..aab39156de1 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -147,7 +147,8 @@ typedef struct my_charset_handler_st uint (*numchars)(struct charset_info_st *, const char *b, const char *e); uint (*charpos)(struct charset_info_st *, const char *b, const char *e, uint pos); uint (*well_formed_len)(struct charset_info_st *, - const char *b,const char *e, uint nchars); + const char *b,const char *e, + uint nchars, int *error); uint (*lengthsp)(struct charset_info_st *, const char *ptr, uint length); uint (*numcells)(struct charset_info_st *, const char *b, const char *e); @@ -341,7 +342,8 @@ int my_wildcmp_8bit(CHARSET_INFO *, uint my_numchars_8bit(CHARSET_INFO *, const char *b, const char *e); uint my_numcells_8bit(CHARSET_INFO *, const char *b, const char *e); uint my_charpos_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos); -uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e, uint pos); +uint my_well_formed_len_8bit(CHARSET_INFO *, const char *b, const char *e, + uint pos, int *error); int my_mbcharlen_8bit(CHARSET_INFO *, uint c); @@ -359,7 +361,8 @@ int my_wildcmp_mb(CHARSET_INFO *, uint my_numchars_mb(CHARSET_INFO *, const char *b, const char *e); uint my_numcells_mb(CHARSET_INFO *, const char *b, const char *e); uint my_charpos_mb(CHARSET_INFO *, const char *b, const char *e, uint pos); -uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e, uint pos); +uint my_well_formed_len_mb(CHARSET_INFO *, const char *b, const char *e, + uint pos, int *error); uint my_instr_mb(struct charset_info_st *, const char *b, uint b_length, const char *s, uint s_length, |