Commit 6c40ce76 authored by unknown's avatar unknown
Browse files

Merge 


VC++Files/client/mysqlclient_ia64.dsp:
  Auto merged
include/config-win.h:
  Auto merged
sql/item_sum.cc:
  SCCS merged
parents 629d59a8 83304cd0

VC++Files/client/mysqlclient_ia64.dsp

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ SOURCE="..\strings\ctype-czech.c" 
# End Source File

# Begin Source File



SOURCE="..\strings\ctype-cp963.c"

SOURCE="..\strings\ctype-cp932.c"

# End Source File

# Begin Source File

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ inline double ulonglong2double(ulonglong value) 
#define doublestore(T,V) { *((long *) T) = *((long*) &V); \

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

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

#define floatget(V,M)   memcpy((byte*)(&V), (byte*)(M), sizeof(float))

#define float8get(V,M) doubleget((V),(M))

sql/item_sum.cc

+1 −0
Original line number Diff line number Diff line
@@ -3037,6 +3037,7 @@ bool Item_func_group_concat::setup(THD *thd) 
    DBUG_RETURN(TRUE);



  count_field_types(tmp_table_param,all_fields,0);

  tmp_table_param->need_const= 1;

  DBUG_ASSERT(table == 0);

  /*

    We have to create a temporary table to get descriptions of fields