Merge lp:~laurynas-biveinis/percona-server/bug1039931 into lp:percona-server/5.1

[Laurynas Biveinis]

Issue found during 5.1 -> 5.5 bitmap writer merge:

Fix bug 1039931 (64-bit atomic operation Autoconf tests duplicated in
regular atomic operation tests).

The fix is to remove the redundant long long tests from the non-64-bit
atomic operations Autoconf tests.

For 5.5, the fix is included in the merge revision, thus this one will have to be null-merged.

Jenkins: http://jenkins.percona.com/job/percona-server-5.1-param/381/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'Percona-Server/storage/innodb_plugin/plug.in'
--- Percona-Server/storage/innodb_plugin/plug.in	2012-06-14 09:16:03 +0000
+++ Percona-Server/storage/innodb_plugin/plug.in	2012-08-22 13:19:08 +0000
@@ -67,10 +67,6 @@
 	long	res;
 	char	c;
 
-	long long t;
-	long long z;
-	long long res2;
-
 	x = 10;
 	y = 123;
 	res = __sync_bool_compare_and_swap(&x, x, y);
@@ -97,21 +93,6 @@
 	if (res != 10 || c != 123) {
 	  return(1);
 	}
-
-	t = 10;
-	z = 123;
-	res = __sync_bool_compare_and_swap(&t, t, z);
-	if (!res || t != z) {
-	  return(1);
-	}
-
-	t = 10;
-	z = 123;
-	res2 = __sync_add_and_fetch(&t, z);
-	if (res2 != 123 + 10 || t != 123 + 10) {
-	  return(1);
-	}
-
 	return(0);
       }
     ],