diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-13 13:53:59 -0500 |
| commit | ee8b5c305a2334d06fe999b2db441d0436f9f423 (patch) | |
| tree | fb613fed64234c3e211d2ae01272e1f31ca19138 /include | |
| parent | 11544334a277508fb984c0a5bba8faa6b97a2762 (diff) | |
| parent | 4f5338467807f099b67f07d0bfb415358222a2b1 (diff) | |
| download | mariadb-git-ee8b5c305a2334d06fe999b2db441d0436f9f423.tar.gz | |
Merge tag 'mariadb-10.0.29' into 10.0-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 5994816cbfc..8d9838fdde2 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -180,6 +180,9 @@ extern MY_UNI_CTYPE my_uni_ctype[256]; /* A helper macros for "need at least n bytes" */ #define MY_CS_TOOSMALLN(n) (-100-(n)) +#define MY_CS_IS_TOOSMALL(rc) ((rc) >= MY_CS_TOOSMALL6 && (rc) <= MY_CS_TOOSMALL) + + #define MY_SEQ_INTTAIL 1 #define MY_SEQ_SPACES 2 diff --git a/include/my_sys.h b/include/my_sys.h index f6bf57e50a4..5e1f6baac77 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -620,8 +620,12 @@ extern void *my_memmem(const void *haystack, size_t haystacklen, #ifdef _WIN32 extern int my_access(const char *path, int amode); +#define my_check_user(A,B) (NULL) +#define my_set_user(A,B,C) (0) #else #define my_access access +struct passwd *my_check_user(const char *user, myf MyFlags); +int my_set_user(const char *user, struct passwd *user_info, myf MyFlags); #endif extern int check_if_legal_filename(const char *path); |