From b6f6d5b2fd920c5f8c8e611c9b58b43077b21f8d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 13 Aug 2004 18:29:25 +0200 Subject: apply UNIQUE constrain correctly for multi-byte charsets only MyISAM is fixed include/m_ctype.h: my_charpos() macro myisam/mi_key.c: apply UNIQUE constrain correctly for multi-byte charsets mysql-test/r/binary.result: new test mysql-test/r/key.result: apply UNIQUE constrain correctly for multi-byte charsets mysql-test/t/binary.test: new test mysql-test/t/func_gconcat.test: make test to pass w/o InnoDB mysql-test/t/key.test: apply UNIQUE constrain correctly for multi-byte charsets --- include/m_ctype.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/m_ctype.h b/include/m_ctype.h index 785fa431385..1b6e7bf6739 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -391,8 +391,10 @@ extern my_bool my_parse_charset_xml(const char *bug, uint len, #define my_strnncoll(s, a, b, c, d) ((s)->coll->strnncoll((s), (a), (b), (c), (d), 0)) #define my_like_range(s, a, b, c, d, e, f, g, h, i, j) \ ((s)->coll->like_range((s), (a), (b), (c), (d), (e), (f), (g), (h), (i), (j))) -#define my_wildcmp(cs,s,se,w,we,e,o,m) ((cs)->coll->wildcmp((cs),(s),(se),(w),(we),(e),(o),(m))) +#define my_wildcmp(cs,s,se,w,we,e,o,m) ((cs)->coll->wildcmp((cs),(s),(se),(w),(we),(e),(o),(m))) #define my_strcasecmp(s, a, b) ((s)->coll->strcasecmp((s), (a), (b))) +#define my_charpos(cs, b, e, num) (cs)->cset->charpos((cs), (const char*) (b), (const char *)(e), (num)) + #define use_mb(s) ((s)->cset->ismbchar != NULL) #define my_ismbchar(s, a, b) ((s)->cset->ismbchar((s), (a), (b))) -- cgit v1.2.1