diff options
| author | unknown <acurtis@xiphis.org> | 2005-08-11 12:18:53 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-08-11 12:18:53 +0100 |
| commit | de00ff7626c85cd8809daa85c840f0f6736c6099 (patch) | |
| tree | 7e424eae0123e35fa5eec3670a550a310c6e1916 /include | |
| parent | 98da6d5ffbaf00dfc9f2b3d18bbda665cf3fd67e (diff) | |
| parent | bf07693148f916b27e8a520965fdd556ad054806 (diff) | |
| download | mariadb-git-de00ff7626c85cd8809daa85c840f0f6736c6099.tar.gz | |
Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into xiphis.org:/usr/home/antony/work2/merge-5.0
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisammrg/myrg_static.c:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/rpl_drop_temp.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/my_time.c:
Auto merged
include/my_sys.h:
manual merge 4.1->5.0
mysql-test/r/bigint.result:
manual merge 4.1->5.0
mysql-test/r/subselect.result:
manual merge 4.1->5.0
mysql-test/t/subselect.test:
manual merge 4.1->5.0
mysys/charset.c:
manual merge 4.1->5.0
sql/ha_ndbcluster.cc:
manual merge 4.1->5.0
sql/item_strfunc.cc:
manual merge 4.1->5.0
sql/sql_base.cc:
manual merge 4.1->5.0
sql/sql_select.cc:
manual merge 4.1->5.0
sql/sql_union.cc:
manual merge 4.1->5.0
strings/Makefile.am:
manual merge 4.1->5.0
tests/mysql_client_test.c:
manual merge 4.1->5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index d5488ce12fa..11e8a36f5fa 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -866,6 +866,11 @@ extern void add_compiled_collation(CHARSET_INFO *cs); extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info, char *to, ulong to_length, const char *from, ulong length); +#ifdef __WIN__ +#define BACKSLASH_MBTAIL +/* File system character set */ +extern CHARSET_INFO *fs_character_set(void); +#endif extern ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info, char *to, ulong to_length, const char *from, ulong length); |