diff options
| author | mskold@mysql.com <> | 2005-02-01 10:05:22 +0100 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-02-01 10:05:22 +0100 |
| commit | f21a737197c81a598639e7da7ce901e6b06d966d (patch) | |
| tree | 3305456120aff67a778b05a18de2a8aff865176e /include | |
| parent | ee0a4499903245d0ba16b26c2a29c89efbceab56 (diff) | |
| parent | af1e8cf7ad9ab5d00e3dd69cc2d2af28d8eabe98 (diff) | |
| download | mariadb-git-f21a737197c81a598639e7da7ce901e6b06d966d.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 9 | ||||
| -rw-r--r-- | include/m_ctype.h | 4 | ||||
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index e11ca2b4647..08beb4b7236 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -33,15 +33,10 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ mysql_version.h.in my_handler.h my_time.h decimal.h # mysql_version.h are generated -SUPERCLEANFILES = mysql_version.h my_config.h +CLEANFILES = mysql_version.h my_config.h readline # Some include files that may be moved and patched by configure -DISTCLEANFILES = sched.h $(SUPERCLEANFILES) - -clean: - $(RM) -fr readline -distclean: - $(RM) -fr readline +DISTCLEANFILES = sched.h $(CLEANFILES) all-local: my_config.h diff --git a/include/m_ctype.h b/include/m_ctype.h index c2354c7feff..c41c7385b3d 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -110,6 +110,7 @@ typedef struct my_collation_handler_st my_bool diff_if_only_endspace_difference); int (*strnxfrm)(struct charset_info_st *, uchar *, uint, const uchar *, uint); + uint (*strnxfrmlen)(struct charset_info_st *, uint); my_bool (*like_range)(struct charset_info_st *, const char *s, uint s_length, pchar w_prefix, pchar w_one, pchar w_many, @@ -259,7 +260,8 @@ extern CHARSET_INFO my_charset_cp1250_czech_ci; /* declarations for simple charsets */ extern int my_strnxfrm_simple(CHARSET_INFO *, uchar *, uint, const uchar *, - uint); + uint); +uint my_strnxfrmlen_simple(CHARSET_INFO *, uint); extern int my_strnncoll_simple(CHARSET_INFO *, const uchar *, uint, const uchar *, uint, my_bool); diff --git a/include/my_global.h b/include/my_global.h index 21ba4331cb1..f27eb4733bd 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -530,7 +530,11 @@ typedef SOCKET_SIZE_TYPE size_socket; #define FN_LEN 256 /* Max file name len */ #define FN_HEADLEN 253 /* Max length of filepart of file name */ #define FN_EXTLEN 20 /* Max length of extension (part of FN_LEN) */ +#ifdef PATH_MAX +#define FN_REFLEN PATH_MAX/* Max length of full path-name */ +#else #define FN_REFLEN 512 /* Max length of full path-name */ +#endif #define FN_EXTCHAR '.' #define FN_HOMELIB '~' /* ~/ is used as abbrev for home dir */ #define FN_CURLIB '.' /* ./ is used as abbrev for current dir */ diff --git a/include/my_sys.h b/include/my_sys.h index d11dc4a3e46..72d4bec74b1 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -259,6 +259,8 @@ extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; extern char *defaults_extra_file; +extern my_bool timed_mutexes; + typedef struct wild_file_pack /* Struct to hold info when selecting files */ { uint wilds; /* How many wildcards */ |