summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2015-11-24 20:04:12 +0200
committerMonty <monty@mariadb.org>2015-11-24 20:04:12 +0200
commitf813a0002922949a23c75affbee530076f4aa1bb (patch)
tree9575212477e26c8f1a4c6957ebe9ec6ff515cd79 /include
parentb30a768e7bcaf926cfacc4b617338184e8d72fe3 (diff)
downloadmariadb-git-f813a0002922949a23c75affbee530076f4aa1bb.tar.gz
Fixed failing test cases and compiler warnings found by buildbot
- Added some extra command to rpl_start_stop to ensure that the IO thread has connected to the master before we shut down the server. - if signal returns signalhandler_t, use this with the alarm code - Added missing tests to sys_vars - Fixed some possible overflow bugs in tabxml.cpp
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 3027eed7e17..693b9c4421b 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -555,7 +555,11 @@ typedef int my_socket; /* File descriptor for sockets */
/* Type for fuctions that handles signals */
#define sig_handler RETSIGTYPE
C_MODE_START
+#ifdef HAVE_SIGHANDLER_T
+#define sig_return sighandler_t
+#else
typedef void (*sig_return)(void); /* Returns type from signal */
+#endif
C_MODE_END
#if defined(__GNUC__) && !defined(_lint)
typedef char pchar; /* Mixed prototypes can take char */