diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 08:56:09 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 08:56:09 +0300 |
| commit | a481de30bb972f055cff088a84a211c1acd5be38 (patch) | |
| tree | 680d500eddf7b51bd2086218a01a42b28efa1f51 /include | |
| parent | e8a2a751212a04e835b2b03408132ecbbab52410 (diff) | |
| parent | 59fca5806af65c8379a993f9e604cb0b20a76e2b (diff) | |
| download | mariadb-git-a481de30bb972f055cff088a84a211c1acd5be38.tar.gz | |
Merge tag 'mariadb-5.5.57' into 5.5-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 6 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index 0c15478439f..cf140cf54ce 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,5 +1,6 @@ /* Copyright (c) 2001, 2013, Oracle and/or its affiliates. + 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 @@ -421,9 +422,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 27940683dad..cd74fdf427b 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/mysql_com.h b/include/mysql_com.h index 0d57b178937..df9681e02a4 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -296,6 +296,8 @@ enum enum_server_command */ #define SERVER_PS_OUT_PARAMS 4096 +#define SERVER_STATUS_ANSI_QUOTES 32768 + /** Server status flags that must be cleared when starting execution of a new SQL statement. |