diff options
| author | igor@rurik.mysql.com <> | 2005-07-31 02:44:18 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2005-07-31 02:44:18 -0700 |
| commit | f4c1b3bae4a28f57a2ff898db6aae8c42a257779 (patch) | |
| tree | eab125f3ab390fa8cb639cbf4604fd61911d465f | |
| parent | 37212c07ade4c1a2d4e46aa35ab27d417711ee6f (diff) | |
| parent | f8375c6cb37455cc1171372d998790588acf7c79 (diff) | |
| download | mariadb-git-f4c1b3bae4a28f57a2ff898db6aae8c42a257779.tar.gz | |
Merge
| -rw-r--r-- | VC++Files/client/mysqlclient_ia64.dsp | 2 | ||||
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | sql/item_sum.cc | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/VC++Files/client/mysqlclient_ia64.dsp b/VC++Files/client/mysqlclient_ia64.dsp index b982b3b281c..bafe729cf6b 100644 --- a/VC++Files/client/mysqlclient_ia64.dsp +++ b/VC++Files/client/mysqlclient_ia64.dsp @@ -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 diff --git a/include/config-win.h b/include/config-win.h index 4eaf97cd4f5..04f79e95c80 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -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)) diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 7bd04626bbd..e26b6a75b7c 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -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 |