From b96f268acc3a693b673fceccc62311e169496731 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 6 Jan 2010 23:27:53 +0200 Subject: Removed compiler warnings Fixed sporadic test failure for suit/pbxt/t/lock_multi.test Fixed sporadic test faulure for suit/rpl/t/do_grant.test OpenSolaris 5.11-x86 now compiles (tested with 32 bit) BUILD/compile-solaris-amd64-debug-forte: Added execute bit BUILD/compile-solaris-x86-32: Added execute bit BUILD/compile-solaris-x86-32-debug: Added execute bit BUILD/compile-solaris-x86-32-debug-forte: Added execute bit BUILD/compile-solaris-x86-forte-32: Added execute bit extra/libevent/devpoll.c: Removed compiler warning extra/libevent/evbuffer.c: Removed compiler warning extra/libevent/select.c: Removed compiler warning mysql-test/mysql-test-run.pl: Fixed sporadic test faulure for suit/rpl/t/do_grant.test (Seen on OpenSolaris) mysql-test/suite/pbxt/r/lock_multi.result: Fixed sporadic test failure for suit/pbxt/t/lock_multi.test (seen in buildbot) This was done by merging the test with main/lock_multi.test mysql-test/suite/pbxt/t/lock_multi.test: Fixed sporadic test failure for suit/pbxt/t/lock_multi.test (seen in buildbot) This was done by merging the test with main/lock_multi.test mysys/my_sync.c: Removed compiler warnings sql/ha_ndbcluster.cc: Fixed linking error on OpenSolaris when compiling without ndb Bug #34866 Can't compile on Solaris 9/Sparc with gcc storage/archive/azlib.h: Removed compiler warning about redefined symbols storage/maria/ma_blockrec.c: Removed compiler warning storage/maria/ma_loghandler.c: Removed compiler warning storage/maria/ma_test3.c: Removed compiler warning storage/myisam/mi_test3.c: Removed compiler warning storage/pbxt/src/ha_pbxt.cc: Removed compiler warning thr_main -> thr_main_pbxt storage/pbxt/src/restart_xt.cc: thr_main -> thr_main_pbxt storage/pbxt/src/thread_xt.cc: thr_main -> thr_main_pbxt This was needed as thr_main() is an internal thread function on OpenSolaris() storage/pbxt/src/thread_xt.h: thr_main -> thr_main_pbxt storage/xtradb/srv/srv0srv.c: Use compatiblity macro to get code to work on OpenSolaris support-files/compiler_warnings.supp: Ignore compiler warning from yassl --- extra/libevent/devpoll.c | 4 +++- extra/libevent/evbuffer.c | 7 ++++--- extra/libevent/select.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'extra/libevent') diff --git a/extra/libevent/devpoll.c b/extra/libevent/devpoll.c index 20813380b20..6d8bc82c641 100644 --- a/extra/libevent/devpoll.c +++ b/extra/libevent/devpoll.c @@ -185,7 +185,9 @@ devpoll_init(struct event_base *base) } static int -devpoll_recalc(struct event_base *base, void *arg, int max) +devpoll_recalc(struct event_base *base __attribute__((unused)), + void *arg __attribute__((unused)), + int max) { struct devpollop *devpollop = arg; diff --git a/extra/libevent/evbuffer.c b/extra/libevent/evbuffer.c index abd6a942431..758143c8225 100644 --- a/extra/libevent/evbuffer.c +++ b/extra/libevent/evbuffer.c @@ -25,12 +25,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include + #ifdef HAVE_SYS_TIME_H #include #endif @@ -75,7 +75,8 @@ bufferevent_add(struct event *ev, int timeout) */ void -bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now, +bufferevent_read_pressure_cb(struct evbuffer *buf, + size_t old __attribute__((unused)), size_t now, void *arg) { struct bufferevent *bufev = arg; /* diff --git a/extra/libevent/select.c b/extra/libevent/select.c index 54078777ac3..b8bd1a1c361 100644 --- a/extra/libevent/select.c +++ b/extra/libevent/select.c @@ -266,7 +266,7 @@ select_add(void *arg, struct event *ev) * of the fd_sets for select(2) */ if (sop->event_fds < ev->ev_fd) { - int fdsz = sop->event_fdsz; + unsigned int fdsz = sop->event_fdsz; if (fdsz < sizeof(fd_mask)) fdsz = sizeof(fd_mask); @@ -275,7 +275,7 @@ select_add(void *arg, struct event *ev) (howmany(ev->ev_fd + 1, NFDBITS) * sizeof(fd_mask))) fdsz *= 2; - if (fdsz != sop->event_fdsz) { + if (fdsz != (unsigned int) sop->event_fdsz) { if (select_resize(sop, fdsz)) { check_selectop(sop); return (-1); -- cgit v1.2.1 From 5b60ec399bb620dd7ff35c73422b80073b8f5330 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Jan 2010 14:00:06 +0100 Subject: Revert earlier change that removes warnings, but breaks Windows compilation. --- extra/libevent/devpoll.c | 4 +--- extra/libevent/evbuffer.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'extra/libevent') diff --git a/extra/libevent/devpoll.c b/extra/libevent/devpoll.c index 6d8bc82c641..20813380b20 100644 --- a/extra/libevent/devpoll.c +++ b/extra/libevent/devpoll.c @@ -185,9 +185,7 @@ devpoll_init(struct event_base *base) } static int -devpoll_recalc(struct event_base *base __attribute__((unused)), - void *arg __attribute__((unused)), - int max) +devpoll_recalc(struct event_base *base, void *arg, int max) { struct devpollop *devpollop = arg; diff --git a/extra/libevent/evbuffer.c b/extra/libevent/evbuffer.c index 758143c8225..6fe791380ea 100644 --- a/extra/libevent/evbuffer.c +++ b/extra/libevent/evbuffer.c @@ -75,8 +75,7 @@ bufferevent_add(struct event *ev, int timeout) */ void -bufferevent_read_pressure_cb(struct evbuffer *buf, - size_t old __attribute__((unused)), size_t now, +bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now, void *arg) { struct bufferevent *bufev = arg; /* -- cgit v1.2.1