summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorbar@mysql.com <>2005-05-06 11:48:54 +0500
committerbar@mysql.com <>2005-05-06 11:48:54 +0500
commitb93385de8f6c45305b965fdb603734dc510fd039 (patch)
tree5cc9bb227fd02383b33fbcdca4f63e2ef5ea32d5 /include
parentb4d43939fb435901bb315d87c0a08004148db2be (diff)
parent153b928c1041231df5939cefcce9ca6e727aed6b (diff)
downloadmariadb-git-b93385de8f6c45305b965fdb603734dc510fd039.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0
Diffstat (limited to 'include')
-rw-r--r--include/m_ctype.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 61524dc4ddd..6f304f4ba43 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -132,6 +132,7 @@ typedef struct my_collation_handler_st
/* Hash calculation */
void (*hash_sort)(struct charset_info_st *cs, const uchar *key, uint len,
ulong *nr1, ulong *nr2);
+ my_bool (*propagate)(struct charset_info_st *cs, const uchar *str, uint len);
} MY_COLLATION_HANDLER;
extern MY_COLLATION_HANDLER my_collation_mb_bin_handler;
@@ -385,6 +386,10 @@ int my_wildcmp_unicode(CHARSET_INFO *cs,
extern my_bool my_parse_charset_xml(const char *bug, uint len,
int (*add)(CHARSET_INFO *cs));
+my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, uint len);
+my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, uint len);
+
+
#define _MY_U 01 /* Upper case */
#define _MY_L 02 /* Lower case */
#define _MY_NMR 04 /* Numeral (digit) */