Merge mysql.com:/home/jimw/my/mysql-5.0-build

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysys/thr_lock.c:
  Auto merged
sql/ha_federated.cc:
  Auto merged

1 files changed, 1 insertions, 0 deletions

diff --git a/include/config-win.h b/include/config-win.h
index 6e0740497b0..4eaf97cd4f5 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -285,6 +285,7 @@ inline double ulonglong2double(ulonglong value)
 			   *(((long *) T)+1) = *(((long*) &V)+1); }
 #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }
 #define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))
+#define floatget(V,M)   memcpy((byte*)(&V), (byte*)(M), sizeof(float))
 #define float8get(V,M) doubleget((V),(M))
 #define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
 #define float8store(V,M) doublestore((V),(M))