Merge lp:~laurynas-biveinis/percona-server/bug962940-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

    Fix bug 962940: InnoDB compilation warnings:

    [ 48%] Building C object storage/innobase/CMakeFiles/innobase.dir/ibuf/ibuf0ibuf.c.o
    cc1: warnings being treated as errors
    /home/jenkins/workspace/percona-server-5.5-trunk/BUILD_TYPE/debug/Host/centos5-32/Percona-Server-5.5.21-rel24.2/storage/innobase/ibuf/ibuf0ibuf.c: In function 'ibuf_add_ops':
    /home/jenkins/workspace/percona-server-5.5-trunk/BUILD_TYPE/debug/Host/centos5-32/Percona-Server-5.5.21-rel24.2/storage/innobase/ibuf/ibuf0ibuf.c:1526: warning: value computed is not used
    /home/jenkins/workspace/percona-server-5.5-trunk/BUILD_TYPE/debug/Host/centos5-32/Percona-Server-5.5.21-rel24.2/storage/innobase/ibuf/ibuf0ibuf.c: In function 'ibuf_merge_or_delete_for_page':
    /home/jenkins/workspace/percona-server-5.5-trunk/BUILD_TYPE/debug/Host/centos5-32/Percona-Server-5.5.21-rel24.2/storage/innobase/ibuf/ibuf0ibuf.c:4788: warning: value computed is not used
    make[2]: ***
    [storage/innobase/CMakeFiles/innobase.dir/ibuf/ibuf0ibuf.c.o] Error 1

    The fix is to cast invocations of os_atomic_* functions to (void) to
    show that we intentionally discard it.

[Laurynas Biveinis (laurynas-biveinis)]

http://jenkins.percona.com/job/percona-server-5.5-param/304/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'patches/warning_fixes.patch'
--- patches/warning_fixes.patch	2011-12-13 15:06:50 +0000
+++ patches/warning_fixes.patch	2012-03-25 10:18:18 +0000
@@ -9,3 +9,23 @@
        int             error= 0;
        struct timespec abstime;
  
+--- a/storage/innobase/ibuf/ibuf0ibuf.c
++++ b/storage/innobase/ibuf/ibuf0ibuf.c
+@@ -1523,7 +1523,7 @@
+ 
+ 	for (i = 0; i < IBUF_OP_COUNT; i++) {
+ #ifdef HAVE_ATOMIC_BUILTINS
+-		os_atomic_increment_ulint(&arr[i], ops[i]);
++		(void) os_atomic_increment_ulint(&arr[i], ops[i]);
+ #else /* HAVE_ATOMIC_BUILTINS */
+ 		arr[i] += ops[i];
+ #endif /* HAVE_ATOMIC_BUILTINS */
+@@ -4785,7 +4785,7 @@
+ 	mem_heap_free(heap);
+ 
+ #ifdef HAVE_ATOMIC_BUILTINS
+-	os_atomic_increment_ulint(&ibuf->n_merges, 1);
++	(void) os_atomic_increment_ulint(&ibuf->n_merges, 1);
+ 	ibuf_add_ops(ibuf->n_merged_ops, mops);
+ 	ibuf_add_ops(ibuf->n_discarded_ops, dops);
+ #else /* HAVE_ATOMIC_BUILTINS */