bzr push into mysql-6.0-perf branch (marc.alff:2729 to 2730)

[Marc Alff]

 2730 Marc Alff	2008-11-06
      Fixed build break
modified:
  include/Makefile.am
  unittest/mysys/my_rdtsc-t.c

 2729 Marc Alff	2008-11-06
      fixed typo
modified:
  mysys/Makefile.am

=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2008-10-27 18:44:39 +0000
+++ b/include/Makefile.am	2008-11-07 01:41:07 +0000
@@ -40,7 +40,7 @@ noinst_HEADERS =	config-win.h config-net
 			my_vle.h my_user.h my_atomic.h atomic/nolock.h \
 			atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
 			atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
-                        wqueue.h waiting_threads.h
+                        wqueue.h waiting_threads.h my_rdtsc.h
 
 EXTRA_DIST =            mysql.h.pp mysql/plugin.h.pp \
                         mysql/psi_abi_v1.h.pp \

=== modified file 'unittest/mysys/my_rdtsc-t.c'
--- a/unittest/mysys/my_rdtsc-t.c	2008-11-07 00:21:14 +0000
+++ b/unittest/mysys/my_rdtsc-t.c	2008-11-07 01:41:07 +0000
@@ -192,7 +192,8 @@ void test_tick()
   ok((nonzero != 0), "The tick timer is implemented");
 }
 
-int main(int argc, char **argv)
+int main(int argc __attribute__((unused)),
+         char ** argv __attribute__((unused)))
 {
   plan(11);
 
@@ -202,5 +203,7 @@ int main(int argc, char **argv)
   test_microsecond();
   test_millisecond();
   test_tick();
+
+  return 0;
 }