diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-08 10:18:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-08 10:18:43 +0200 |
| commit | 8e8d42ddf0291b2364fef8e3224e65d596ef4202 (patch) | |
| tree | 056e6f1c489477cb7e1c285924e88f8f02e5918b /include | |
| parent | 2395adfbfd6b4425981053f074865769414b5614 (diff) | |
| parent | ef2e51c39637ace64b66fa82b834e31f0e4ef38a (diff) | |
| download | mariadb-git-8e8d42ddf0291b2364fef8e3224e65d596ef4202.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/service_versions.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index b958a8d9e28..b9284b99577 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,6 +1,6 @@ /* Copyright (c) 2001, 2013, Oracle and/or its affiliates. - Copyright (c) 2010, 2013, Monty Program Ab. + Copyright (c) 2009, 2017, MariaDB Corporation 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 @@ -439,9 +439,8 @@ extern "C" int madvise(void *addr, size_t len, int behav); #define SIGNAL_HANDLER_RESET_ON_DELIVERY #endif -#ifndef STDERR_FILENO -#define STDERR_FILENO fileno(stderr) -#endif +/* don't assume that STDERR_FILENO is 2, mysqld can freopen */ +#undef STDERR_FILENO #ifndef SO_EXT #ifdef _WIN32 diff --git a/include/my_sys.h b/include/my_sys.h index 6eadec05124..110a2ee9af3 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2010, 2016, Monty Program Ab. + Copyright (c) 2010, 2017, MariaDB Corporation 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 diff --git a/include/service_versions.h b/include/service_versions.h index ddc780a44b9..da7a2101f76 100644 --- a/include/service_versions.h +++ b/include/service_versions.h @@ -36,7 +36,7 @@ #define VERSION_progress_report 0x0100 #define VERSION_thd_alloc 0x0100 #define VERSION_thd_autoinc 0x0100 -#define VERSION_thd_error_context 0x0100 +#define VERSION_thd_error_context 0x0200 #define VERSION_thd_rnd 0x0100 #define VERSION_thd_specifics 0x0100 #define VERSION_thd_timezone 0x0100 |