Commit 57bfc6dd authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/local/mysql/mysql-4.1
parents 8f6c1a56 baff781b

include/config-win.h

+4 −4
Original line number Diff line number Diff line
@@ -278,10 +278,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 floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))

#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -2035,7 +2035,7 @@ Rotate_log_event::Rotate_log_event(THD* thd_arg, 
                      llstr(pos_arg, buff), flags));

#endif

  if (flags & DUP_NAME)

    new_log_ident= my_strdup_with_length(new_log_ident_arg,

    new_log_ident= my_strdup_with_length((byte*) new_log_ident_arg,

                                         ident_len,

                                         MYF(MY_WME));

  DBUG_VOID_RETURN;