Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel

into  hynda.mysql.fi:/home/my/mysql-5.1-marvel


include/my_atomic.h:
  Auto merged
include/my_bit.h:
  Auto merged

libmysql/CMakeLists.txt

@@ -98,7 +98,7 @@ SET(CLIENT_SOURCES   ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
                      ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c 
                      ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c 
                      ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c
-		     ../mysys/my_getsystime.c ${LIB_SOURCES})
+		     ../mysys/my_getsystime.c ../mysys/my_sync.c ${LIB_SOURCES})
 
 # Need to set USE_TLS for building the DLL, since __declspec(thread)
 # approach to thread local storage does not work properly in DLLs.