diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 08:56:11 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 08:56:11 +0300 |
| commit | 56b03e308fb4c0feee166ddf6a707d855affa3c3 (patch) | |
| tree | fc4e16093800cf4cbf1cc54fceb0b7280c4212ba /include | |
| parent | 4f40f87c48a9ee252f797b5d760a6b6f07cc3815 (diff) | |
| parent | a346a5613ee7c0b17b0b4ce377659c996ef6bb75 (diff) | |
| download | mariadb-git-56b03e308fb4c0feee166ddf6a707d855affa3c3.tar.gz | |
Merge tag 'mariadb-10.0.32' into 10.0-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 | ||||
| -rw-r--r-- | include/service_versions.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index 535051d6d8b..b43ba93e080 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 diff --git a/include/mysql_com.h b/include/mysql_com.h index 96514a28310..7853aa0195a 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -329,6 +329,8 @@ enum enum_server_command */ #define SERVER_STATUS_IN_TRANS_READONLY 8192 +#define SERVER_STATUS_ANSI_QUOTES 32768 + /** Server status flags that must be cleared when starting diff --git a/include/service_versions.h b/include/service_versions.h index cca190b811c..ce4a0c931f7 100644 --- a/include/service_versions.h +++ b/include/service_versions.h @@ -31,4 +31,4 @@ #define VERSION_my_sha1 0x0100 #define VERSION_logger 0x0100 #define VERSION_thd_autoinc 0x0100 -#define VERSION_thd_error_context 0x0100 +#define VERSION_thd_error_context 0x0200 |