diff options
author | guilhem@mysql.com <> | 2003-10-31 23:20:23 +0100 |
---|---|---|
committer | guilhem@mysql.com <> | 2003-10-31 23:20:23 +0100 |
commit | c1f7f3396005d40470a4ae069c57aa48ad645ac3 (patch) | |
tree | 498d4bfea3f5514d76aac06dd4120c7aa8b1a02c /include/my_net.h | |
parent | 975177fdb2406cd3191a1e60f25a2ba5a1fb7324 (diff) | |
download | mariadb-git-c1f7f3396005d40470a4ae069c57aa48ad645ac3.tar.gz |
4 small items in this:
- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.
Diffstat (limited to 'include/my_net.h')
-rw-r--r-- | include/my_net.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/my_net.h b/include/my_net.h index 28d862d8528..7b42afa1f3a 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -63,6 +63,15 @@ C_MODE_START #define O_NONBLOCK 1 /* For emulation of fcntl() */ #endif +/* + On OSes which don't have the in_addr_t, we guess that using uint32 is the best + possible choice. We guess this from the fact that on HP-UX64bit & FreeBSD64bit + & Solaris64bit, in_addr_t is equivalent to uint32. And on Linux32bit too. +*/ +#ifndef HAVE_IN_ADDR_T +#define in_addr_t uint32 +#endif + /* Thread safe or portable version of some functions */ void my_inet_ntoa(struct in_addr in, char *buf); |