diff options
author | Michael Widenius <monty@askmonty.org> | 2013-05-05 21:39:31 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-05-05 21:39:31 +0300 |
commit | 5333dafa843477b5499a5e77a5bf942bc1ed7a18 (patch) | |
tree | 68d5e2992f722da60f984cd4b8dcbea489334945 /vio | |
parent | 5aa0d185ca18cf538eea5c9c501e1e342b41b274 (diff) | |
download | mariadb-git-5333dafa843477b5499a5e77a5bf942bc1ed7a18.tar.gz |
Fixed errors and compiler warnings found by buildbot
Solaris fixes:
- Fixed that wait_timeout_func and wait_timeout tests works on solaris
- We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO).
- Fixed that compile-solaris-amd64-debug works (before that we got a wrong ELF class: ELFCLASS64 on linkage)
- Added missing sync_with_master
Other bug fixes:
- Free memory for rpl_global_gtid_binlog_state before exit() to avoid 'accessing uninitalized mutex' error.
BUILD/FINISH.sh:
Fixed issues on Solaris with ksh
BUILD/compile-solaris-amd64-debug:
Added missing -m64 flag
configure.cmake:
We have to compile without NO_ALARM on Solaris as Solaris doesn't support timeouts on sockets with setsockopt(.. SO_RCVTIMEO)
mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test:
- Added missing sync_with_master (fix by knielsen)
sql-common/client.c:
Added () to get rid of compiler warning
sql/item_strfunc.cc:
Fixed compiler warning
sql/log.cc:
Free memory for static variable rpl_global_gtid_binlog_state before exit()
- If we are compiling with safemalloc, we would try to call sf_free() for some members after sf_terminate() was called, which would result of trying to access the uninitalized mutex 'sf_mutex'
sql/multi_range_read.cc:
Fixed compiler warnings of converting double to ulong.
sql/opt_range.cc:
Fixed compiler warnings of converting double to ulong or uint
- Better to have all variables that can be number of rows as 'ha_rows'
sql/rpl_gtid.cc:
Added rpl_binlog_state::free() to be able to free memory for static objects before exit()
sql/rpl_gtid.h:
Added rpl_binlog_state::free() to be able to free memory for static objects before exit()
sql/set_var.cc:
Fixed compiler warning
sql/sql_join_cache.cc:
Fixed compiler warnings of converting double to uint
sql/sql_show.cc:
Added cast to get rid of compiler warning
sql/sql_statistics.cc:
Remove code that didn't do anything.
(store_record() with record[0] is a no-op)
storage/xtradb/os/os0file.c:
Added __attribute__ ((unused))
support-files/compiler_warnings.supp:
Ignore warnings from atomic_add_64_nv
(was not able to fix this with a cast as the macro is a bit different between systems)
vio/viosocket.c:
Added more DBUG_PRINT
Diffstat (limited to 'vio')
-rw-r--r-- | vio/viosocket.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index baefa1c6d06..960b49276a8 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -322,7 +322,9 @@ int vio_fastsend(Vio * vio __attribute__((unused))) } if (r) { - DBUG_PRINT("warning", ("Couldn't set socket option for fast send")); + DBUG_PRINT("warning", + ("Couldn't set socket option for fast send, error %d", + socket_errno)); r= -1; } DBUG_PRINT("exit", ("%d", r)); @@ -819,7 +821,7 @@ void vio_timeout(Vio *vio, uint which, uint timeout) #if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO) int r; DBUG_ENTER("vio_timeout"); - + DBUG_PRINT("enter", ("which: %u timeout: %u", which, timeout)); { #ifdef __WIN__ /* Windows expects time in milliseconds as int */ @@ -846,6 +848,7 @@ void vio_timeout(Vio *vio, uint which, uint timeout) Platforms not suporting setting of socket timeout should either use thr_alarm or just run without read/write timeout(s) */ + DBUG_PRINT("warning", ("timeout ignored")); #endif /* Make timeout values available for async operations. */ if (which) |