summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <elliot@mysql.com>2005-08-17 04:32:29 -0400
committerunknown <elliot@mysql.com>2005-08-17 04:32:29 -0400
commit99cf8c38e0840f113988b9c131bfb04c864ffc42 (patch)
tree867e0960e68a70a90ef68c0f2a5bb1a971cbd661 /include
parent0f7bb92df9198f9541b53e32cdf1324fe58a606c (diff)
parenta29b1d7151497b4777e4b4917f0eee001705a928 (diff)
downloadmariadb-git-99cf8c38e0840f113988b9c131bfb04c864ffc42.tar.gz
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
into mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338 sql/item.h: Auto merged
Diffstat (limited to 'include')
-rw-r--r--include/m_ctype.h1
-rw-r--r--include/my_sys.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h
index ab63a1e0db1..a5dc7cc00c6 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -220,6 +220,7 @@ typedef struct charset_info_st
uint mbmaxlen;
uint16 min_sort_char;
uint16 max_sort_char; /* For LIKE optimization */
+ my_bool escape_with_backslash_is_dangerous;
MY_CHARSET_HANDLER *cset;
MY_COLLATION_HANDLER *coll;
diff --git a/include/my_sys.h b/include/my_sys.h
index 8752aa30772..eafa41a05c8 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -788,6 +788,7 @@ extern my_bool init_compiled_charsets(myf flags);
extern void add_compiled_collation(CHARSET_INFO *cs);
extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info, char *to,
const char *from, ulong length);
+extern char *bare_str_to_hex(char *to, const char *from, uint len);
#ifdef __WIN__
#define BACKSLASH_MBTAIL
/* File system character set */