Merge trift-lap.fambruehe:/MySQL/M51/part1-kent-knielsen

into trift-lap.fambruehe:/MySQL/M51/merge-5.1

extra/innochecksum.c

@@ -28,7 +28,7 @@
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 
-#define _XOPEN_SOURCE /* needed to include getopt.h on some platforms. */
+#define _XOPEN_SOURCE 500 /* needed to include getopt.h on some platforms. */
 
 #include <stdio.h>
 #include <stdlib.h>

mysql-test/t/rpl_relayrotate.test

@@ -52,9 +52,8 @@ start slave;
 # which proves that the transaction restarted at
 # the right place.
 # We must wait for the transaction to commit before
-# reading, MASTER_POS_WAIT() will do it for sure
-# (the only statement with position>=3000 is COMMIT).
-select master_pos_wait('master-bin.001',3000)>=0;
+# reading:
+sync_with_master;
 select max(a) from t1;
 connection master;