diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-18 10:26:50 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-18 10:26:50 +0200 |
| commit | 1127d567357418d156822e4ebb9eb99b08514c2d (patch) | |
| tree | 1c6928e89824bfcc53feee0f1eb884f624c26ec0 | |
| parent | 3f8c76f9e5cb9a6f9e40e81859ead33bfbbd3a8f (diff) | |
| download | mariadb-git-1127d567357418d156822e4ebb9eb99b08514c2d.tar.gz | |
Fixed some buildbot failures
mysql-test/suite/rpl/t/rpl_000011-master.opt:
Added master.opt file to ensure that other tests don't interfere with rpl_000011
plugin/server_audit/server_audit.c:
Fixed compiler error on solaris
support-files/compiler_warnings.supp:
Ignore warning from xtradb
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_000011-master.opt | 1 | ||||
| -rw-r--r-- | plugin/server_audit/server_audit.c | 16 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_000011-master.opt b/mysql-test/suite/rpl/t/rpl_000011-master.opt new file mode 100644 index 00000000000..7c3d2411b28 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_000011-master.opt @@ -0,0 +1 @@ +--verbose=1 diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 353fbc99c20..3957f39b1d6 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -257,7 +257,13 @@ static const char *syslog_facility_names[]= { "LOG_USER", "LOG_MAIL", "LOG_DAEMON", "LOG_AUTH", "LOG_SYSLOG", "LOG_LPR", "LOG_NEWS", "LOG_UUCP", - "LOG_CRON", "LOG_AUTHPRIV", "LOG_FTP", + "LOG_CRON", +#ifdef LOG_AUTHPRIV + "LOG_AUTHPRIV", +#endif +#ifdef LOG_FTP + "LOG_FTP", +#endif "LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", "LOG_LOCAL4", "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", 0 @@ -266,7 +272,13 @@ static unsigned int syslog_facility_codes[]= { LOG_USER, LOG_MAIL, LOG_DAEMON, LOG_AUTH, LOG_SYSLOG, LOG_LPR, LOG_NEWS, LOG_UUCP, - LOG_CRON, LOG_AUTHPRIV, LOG_FTP, + LOG_CRON, +#ifdef LOG_AUTHPRIV + LOG_AUTHPRIV, +#endif +#ifdef LOG_FTP + LOG_FTP, +#endif LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, }; diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 315af529149..21dfbbe0653 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -49,6 +49,7 @@ ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type +buf/buf0buf\.c : warning: label ~loop2~ defined but not used # # bdb is not critical to keep up to date |