From c36a0fa5acc1dc74f21eeefd5f5b63605191bddb Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Fri, 29 Jul 2005 12:37:27 +0200
Subject: [PATCH 1/3] - fixed a typo in C++Files/client/mysqlclient_ia64.dsp:
 ctype-cp963.c -> ctype-cp932.c   (thanks to JoergB for spotting it)

---
 VC++Files/client/mysqlclient_ia64.dsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VC++Files/client/mysqlclient_ia64.dsp b/VC++Files/client/mysqlclient_ia64.dsp
index 3edc979b9dc..ea67e1bf514 100644
--- a/VC++Files/client/mysqlclient_ia64.dsp
+++ b/VC++Files/client/mysqlclient_ia64.dsp
@@ -151,7 +151,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
 

From 10615d54fbbef551cdf87824bde22ad6c786071a Mon Sep 17 00:00:00 2001
From: "georg@lmy002.wdf.sap.corp" <>
Date: Fri, 29 Jul 2005 14:51:08 +0200
Subject: [PATCH 2/3] fix for bug#12665

macro floatget was missing in config-win.h
---
 include/config-win.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/config-win.h b/include/config-win.h
index 86704c4740b..0899d961d14 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -283,6 +283,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 float8get(V,M) doubleget((V),(M))
 #define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

From fea0fb2c8b171f19b234c811609854aaf535037f Mon Sep 17 00:00:00 2001
From: "igor@rurik.mysql.com" <>
Date: Sun, 31 Jul 2005 02:32:33 -0700
Subject: [PATCH 3/3] Fixed bug #12095: a join query with GROUP_CONCAT over a
 single row table. If GROUP_CONCAT is calculated we always put its argument
 into a temp table, even when the argument is a constant item.

---
 sql/item_sum.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 6ca3f024f61..1ee48dfb763 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1986,6 +1986,7 @@ bool Item_func_group_concat::setup(THD *thd)
   }
   
   count_field_types(tmp_table_param,all_fields,0);
+  tmp_table_param->need_const= 1;
   if (table)
   {
     /*