diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
| commit | 786ad0a158f92eae0d65b02f34e864a7bbd8390e (patch) | |
| tree | 8b796ce3ce81ab3c1f73e6eb5c594c74619810c0 /include | |
| parent | 2ce3f95151a424f950be40140c45b0ba583e07ab (diff) | |
| parent | c8a0244e957bc4beff453f09c881bb51752d682c (diff) | |
| download | mariadb-git-786ad0a158f92eae0d65b02f34e864a7bbd8390e.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/my_global.h b/include/my_global.h index a61fd765995..ad78303add7 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 /* Deprecated workaround for false-positive uninitialized variables diff --git a/include/my_sys.h b/include/my_sys.h index 22ed7616f1c..9e18373fe15 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 |