mirror of
https://github.com/MariaDB/server.git
synced 2025-12-19 22:42:44 +03:00
Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
This commit is contained in:
@@ -408,4 +408,5 @@ inline double ulonglong2double(ulonglong value)
|
||||
#define HAVE_CHARSET_ucs2 1
|
||||
#define HAVE_CHARSET_ujis 1
|
||||
#define HAVE_CHARSET_utf8 1
|
||||
#define HAVE_UCA_COLLATIONS 1
|
||||
|
||||
|
||||
@@ -804,8 +804,13 @@ my_bool my_gethwaddr(uchar *to);
|
||||
#endif
|
||||
|
||||
#define my_mmap(a,b,c,d,e,f) mmap(a,b,c,d,e,f)
|
||||
#ifdef HAVE_GETPAGESIZE
|
||||
#define my_getpagesize() getpagesize()
|
||||
#define my_munmap(a,b) munmap(a,b)
|
||||
#else
|
||||
/* qnx ? */
|
||||
#define my_getpagesize() 8192
|
||||
#endif
|
||||
#define my_munmap(a,b) munmap((char*)(a),(b))
|
||||
|
||||
#else
|
||||
/* not a complete set of mmap() flags, but only those that nesessary */
|
||||
|
||||
@@ -56,7 +56,8 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */
|
||||
#define EE_CANT_SYMLINK 25
|
||||
#define EE_REALPATH 26
|
||||
#define EE_SYNC 27
|
||||
#define EE_ERROR_LAST 27 /*Copy last error nr.*/
|
||||
#define EE_UNKNOWN_COLLATION 28
|
||||
#define EE_ERROR_LAST 28 /*Copy last error nr.*/
|
||||
/* Add error numbers before EE_ERROR_LAST and change it accordingly. */
|
||||
|
||||
/* exit codes for all MySQL programs */
|
||||
|
||||
Reference in New Issue
Block a user