mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 17:25:31 +02:00
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
This commit is contained in:
commit
99cf8c38e0
22 changed files with 98 additions and 8 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue