Commit 3adea9ce authored by unknown's avatar unknown
Browse files

Merge mysqldev@production:my/mysql-4.1.16-fixes 

into  mysql.com:/usr/local/mysql/mysql-5.0


include/config-win.h:
  Auto merged
sql/log_event.cc:
  Discard 4.1 win32 compile fix that was already in 5.0.
parents 31aeeb7c baff781b

include/config-win.h

+4 −4
Original line number Diff line number Diff line
@@ -279,10 +279,10 @@ inline double ulonglong2double(ulonglong value) 
			  *((T)+4)=(uchar) (((A) >> 32)); }

#define int8store(T,A)	*((ulonglong *) (T))= (ulonglong) (A)



#define doubleget(V,M)	{ *((long *) &V) = *((long*) M); \

			  *(((long *) &V)+1) = *(((long*) M)+1); }

#define doublestore(T,V) { *((long *) T) = *((long*) &V); \

			   *(((long *) T)+1) = *(((long*) &V)+1); }

#define doubleget(V,M)	do { *((long *) &V) = *((long*) M); \

			    *(((long *) &V)+1) = *(((long*) M)+1); } while(0)

#define doublestore(T,V) do { *((long *) T) = *((long*) &V); \

			      *(((long *) T)+1) = *(((long*) &V)+1); } while(0)

#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))