Commit 593b359d authored by kent@mysql.com's avatar kent@mysql.com

mysql.spec.sh:

  Disable old RPM strip
my_global.h:
  Fixed wrong cast, which caused problems with gcc 4.0 and
  floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
  Place output files in common release/debug directory
parent 6f6b966d
...@@ -1071,8 +1071,8 @@ do { doubleget_union _tmp; \ ...@@ -1071,8 +1071,8 @@ do { doubleget_union _tmp; \
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \ #define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
*(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \ *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
} while (0) } while (0)
#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0) #define float4get(V,M) do { *((float *) &(V)) = *((float*) (M)); } while(0)
#define float8get(V,M) doubleget((V),(M)) #define float8get(V,M) doubleget((V),(M))
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float)) #define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V),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 floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="wsock32.lib"
OutputFile="$(OutDir)/mysqlmanager.exe" OutputFile="../../client_debug/mysqlmanager.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/mysqlmanager.pdb" ProgramDatabaseFile="$(OutDir)/mysqlmanager.pdb"
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib" AdditionalDependencies="wsock32.lib"
OutputFile="$(OutDir)/mysqlmanager.exe" OutputFile="../../client_release/mysqlmanager.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
SubSystem="1" SubSystem="1"
......
...@@ -27,6 +27,23 @@ ...@@ -27,6 +27,23 @@
%define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com
# On SuSE 9 no separate "debuginfo" package is built. To enable basic
# debugging on that platform, we don't strip binaries on SuSE 9. We
# disable the strip of binaries by redefining the RPM macro
# "__os_install_post" leaving out the script calls that normally does
# this. We do this in all cases, as on platforms where "debuginfo" is
# created, a script "find-debuginfo.sh" will be called that will do
# the strip anyway, part of separating the executable and debug
# information into separate files put into separate packages.
#
# Some references (shows more advanced conditional usage):
# http://www.redhat.com/archives/rpm-list/2001-November/msg00257.html
# http://www.redhat.com/archives/rpm-list/2003-February/msg00275.html
# http://www.redhat.com/archives/rhl-devel-list/2004-January/msg01546.html
# http://lists.opensuse.org/archive/opensuse-commit/2006-May/1171.html
%define __os_install_post /usr/lib/rpm/brp-compress
Name: MySQL Name: MySQL
Summary: MySQL: a very fast and reliable SQL database server Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment