diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-05 20:33:10 +0300 |
| commit | 2c3c851d2cba73825f81cd06220138b15c17ae4d (patch) | |
| tree | 4130cf52868c41beb3c242ad229031cca73d7e1c /plugin | |
| parent | 474290540a829edcc6a74be8c354053f330bf5de (diff) | |
| parent | 8648b9bed86e9f52c027daec760d6ab5ce52e889 (diff) | |
| download | mariadb-git-2c3c851d2cba73825f81cd06220138b15c17ae4d.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_gssapi/gssapi_errmsg.cc | 4 | ||||
| -rw-r--r-- | plugin/server_audit/server_audit.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/plugin/auth_gssapi/gssapi_errmsg.cc b/plugin/auth_gssapi/gssapi_errmsg.cc index b0eee0e992e..3e23c5733d6 100644 --- a/plugin/auth_gssapi/gssapi_errmsg.cc +++ b/plugin/auth_gssapi/gssapi_errmsg.cc @@ -26,7 +26,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if defined(__FreeBSD__) || defined(SOLARIS) || defined(__sun) +#include <gssapi/gssapi.h> +#else #include <gssapi.h> +#endif #include <string.h> void gssapi_errmsg(OM_uint32 major, OM_uint32 minor, char *buf, size_t size) diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index b1ede4644e6..c8b22eee20c 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -2203,6 +2203,7 @@ static void auditing_v8(MYSQL_THD thd, struct mysql_event_general_v8 *ev_v8) #endif /*x86_64*/ #endif /*DBUG_OFF*/ #endif /* __linux__ */ + struct mysql_event_general event; if (ev_v8->event_class != MYSQL_AUDIT_GENERAL_CLASS) @@ -2263,6 +2264,7 @@ static void auditing_v13(MYSQL_THD thd, unsigned int *ev_v0) int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len) { +#ifdef __linux__ int db_off; int db_len_off; if (debug_server_started) @@ -2286,7 +2288,6 @@ int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len) #endif /*x86_64*/ } -#ifdef __linux__ *name= *(char **) (((char *) thd) + db_off); *len= *((size_t *) (((char*) thd) + db_len_off)); if (*name && (*name)[*len] != 0) |