diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 7 | ||||
| -rw-r--r-- | include/my_pthread.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 12 |
3 files changed, 13 insertions, 9 deletions
diff --git a/include/my_base.h b/include/my_base.h index fad3ce225ef..f26f00e8bfa 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -396,7 +396,12 @@ enum ha_base_keytype { #define HA_ERR_AUTOINC_READ_FAILED 166 /* Failed to get next autoinc value */ #define HA_ERR_AUTOINC_ERANGE 167 /* Failed to set row autoinc value */ #define HA_ERR_GENERIC 168 /* Generic error */ -#define HA_ERR_LAST 168 /*Copy last error nr.*/ +#define HA_ERR_RECORD_IS_THE_SAME 169 /* row not actually updated : + new values same as the old values */ + +#define HA_ERR_LOGGING_IMPOSSIBLE 170 /* It is not possible to log this + statement */ +#define HA_ERR_LAST 170 /*Copy last error nr.*/ /* Add error numbers before HA_ERR_LAST and change it accordingly. */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) diff --git a/include/my_pthread.h b/include/my_pthread.h index e2cce40182d..27b621de925 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -181,8 +181,7 @@ void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/ #define my_pthread_setprio(A,B) SetThreadPriority(GetCurrentThread(), (B)) #define pthread_kill(A,B) pthread_dummy(0) -#define pthread_join(A,B) \ - ((WaitForSingleObject((A), INFINITE) != WAIT_OBJECT_0) || !CloseHandle(A)) +#define pthread_join(A,B) (WaitForSingleObject((A), INFINITE) != WAIT_OBJECT_0) /* Dummy defines for easier code */ #define pthread_attr_setdetachstate(A,B) pthread_dummy(0) diff --git a/include/my_sys.h b/include/my_sys.h index 9148d0cf29b..ca44f9ed39b 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -912,12 +912,12 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, uint cs_flags, myf my_flags); -extern bool resolve_charset(CHARSET_INFO **cs, - const char *cs_name, - CHARSET_INFO *default_cs); -extern bool resolve_collation(CHARSET_INFO **cl, - const char *cl_name, - CHARSET_INFO *default_cl); +extern bool resolve_charset(const char *cs_name, + CHARSET_INFO *default_cs, + CHARSET_INFO **cs); +extern bool resolve_collation(const char *cl_name, + CHARSET_INFO *default_cl, + CHARSET_INFO **cl); extern void free_charsets(void); extern char *get_charsets_dir(char *buf); |