bzr push into mysql-6.0-rpl branch (mats:2799 to 2800)

[Mats Kindahl]

 2800 Mats Kindahl	2009-01-28
      Fixing warning on Windows about unused local variable 'last' in slave.cc.
modified:
  include/my_global.h

 2799 Magnus Svensson	2009-01-28 [merge]
      Merge
modified:
  mysql-test/include/check-warnings.test
  mysql-test/lib/mtr_report.pm
  mysql-test/mysql-test-run.pl

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2009-01-26 16:32:29 +0000
+++ b/include/my_global.h	2009-01-28 15:03:46 +0000
@@ -871,7 +871,10 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #endif
 
 #if !defined(HAVE_STRTOK_R)
-#define strtok_r(A,B,C) strtok((A),(B))
+inline char *strtok_r(char *str, const char *delim, char **saveptr)
+{
+  return strtok(str,delim);
+}
 #endif
 
 /* This is from the old m-machine.h file */