diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-30 15:28:52 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-05-30 15:28:52 +0530 |
| commit | 92209ac6f69974169c543ae82da077f06f2b7c71 (patch) | |
| tree | 1713781010a286fa9a493781a3eb001af062fd62 /include | |
| parent | 0e3170e30d2a4e8f1ed6fd4bbe935355f7370a34 (diff) | |
| parent | 725e47bfb524f4b1d29076c8777056bedd5f00ea (diff) | |
| download | mariadb-git-92209ac6f69974169c543ae82da077f06f2b7c71.tar.gz | |
Merge tag 'mariadb-10.0.31' into 10.0-galera
Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 6 | ||||
| -rw-r--r-- | include/mysql/psi/mysql_file.h | 1 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 5b0a11408a4..22ed7616f1c 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -906,6 +906,12 @@ extern ulonglong my_getcputime(void); #define hrtime_sec_part(X) ((ulong)((X).val % HRTIME_RESOLUTION)) #define my_time(X) hrtime_to_time(my_hrtime()) +#if STACK_DIRECTION < 0 +#define available_stack_size(CUR,END) (long) ((char*)(CUR) - (char*)(END)) +#else +#define available_stack_size(CUR,END) (long) ((char*)(END) - (char*)(CUR)) +#endif + #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h index 2f388c285bf..be9d7116b9b 100644 --- a/include/mysql/psi/mysql_file.h +++ b/include/mysql/psi/mysql_file.h @@ -1423,4 +1423,3 @@ inline_mysql_file_sync( /** @} (end of group File_instrumentation) */ #endif - diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index e9891856221..cd7cd6692be 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2011, 2016, Oracle and/or its affiliates. - Copyright (c) 2011, 2016, MariaDB +/* Copyright (c) 2011, 2017, Oracle and/or its affiliates. + Copyright (c) 2011, 2017, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2016" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2017" /* This define specifies copyright notice which is displayed by every MySQL |