github
/
mysql-audit
mirror of https://github.com/mcafee-enterprise/mysql-audit
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

compilation fix for 5.5.34 and 5.6.14 (and above). issue #66.

pull/86/head
Guy Lichtman 2014-01-09 19:23:54 +02:00
parent 9e2dab5305
commit 73876cf8f9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/audit_handler.h
View File

@ -183,7 +183,12 @@ public:
Security_context * sctx = thd_inst_main_security_ctx(thd); Security_context * sctx = thd_inst_main_security_ctx(thd);
if(!Audit_formatter::thd_offsets.sec_ctx_ip) //check ip to understand if set as host is first and may actually be set to 0 if(!Audit_formatter::thd_offsets.sec_ctx_ip) //check ip to understand if set as host is first and may actually be set to 0
{ {
return (const char *)sctx->host; //interface changed in 5.5.34 and 5.6.14 and up host changed to get_host()
#if (MYSQL_VERSION_ID >= 50534 && MYSQL_VERSION_ID < 50600) || (MYSQL_VERSION_ID >= 50614)
return sctx->get_host()->ptr();
#else
return sctx->host;
#endif
} }
return *(const char **) (((unsigned char *) sctx) return *(const char **) (((unsigned char *) sctx)
+ Audit_formatter::thd_offsets.sec_ctx_host); + Audit_formatter::thd_offsets.sec_ctx_host);
@ -194,7 +199,12 @@ public:
Security_context * sctx = thd_inst_main_security_ctx(thd); Security_context * sctx = thd_inst_main_security_ctx(thd);
if(!Audit_formatter::thd_offsets.sec_ctx_ip) //no offsets use compiled in header if(!Audit_formatter::thd_offsets.sec_ctx_ip) //no offsets use compiled in header
{ {
return (const char *)sctx->ip; //interface changed in 5.5.34 and 5.6.14 and up host changed to get_ip()
#if (MYSQL_VERSION_ID >= 50534 && MYSQL_VERSION_ID < 50600) || (MYSQL_VERSION_ID >= 50614)
return sctx->get_ip()->ptr();
#else
return sctx->ip;
#endif
} }
return *(const char **) (((unsigned char *) sctx) return *(const char **) (((unsigned char *) sctx)
+ Audit_formatter::thd_offsets.sec_ctx_ip); + Audit_formatter::thd_offsets.sec_ctx_ip);
@ -532,3 +542,7 @@ protected:
#endif /* AUDIT_HANDLER_H_ */ #endif /* AUDIT_HANDLER_H_ */