Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2213 06/06/30 02:49:28 kent@stripped +3 -0
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
support-files/mysql.spec.sh
1.145 06/06/30 02:49:09 kent@stripped +17 -0
Disable old RPM strip
include/my_global.h
1.120 06/06/30 01:25:05 kent@stripped +2 -2
Fixed wrong cast, which caused problems with gcc 4.0 and
floats in prepared statements (Bug #19694)
server-tools/instance-manager/mysqlmanager.vcproj
1.6 06/06/29 20:20:56 kent@stripped +2 -2
Place output files in common release/debug directory
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: kent
# Host: c-6a4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root: /Users/kent/mysql/bk/mysql-5.0-release
--- 1.144/support-files/mysql.spec.sh 2006-06-27 20:32:04 +02:00
+++ 1.145/support-files/mysql.spec.sh 2006-06-30 02:49:09 +02:00
@@ -27,6 +27,23 @@
%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
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
--- 1.119/include/my_global.h 2006-06-19 13:11:17 +02:00
+++ 1.120/include/my_global.h 2006-06-30 01:25:05 +02:00
@@ -1071,8 +1071,8 @@
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
*(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
} while (0)
-#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)
-#define float8get(V,M) doubleget((V),(M))
+#define float4get(V,M) do { *((float *) &(V)) = *((float*) (M)); } while(0)
+#define float8get(V,M) doubleget((V),(M))
#define float4store(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))
--- 1.5/server-tools/instance-manager/mysqlmanager.vcproj 2005-09-15 21:30:38 +02:00
+++ 1.6/server-tools/instance-manager/mysqlmanager.vcproj 2006-06-29 20:20:56 +02:00
@@ -34,7 +34,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib"
- OutputFile="$(OutDir)/mysqlmanager.exe"
+ OutputFile="../../client_debug/mysqlmanager.exe"
LinkIncremental="2"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/mysqlmanager.pdb"
@@ -82,7 +82,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib"
- OutputFile="$(OutDir)/mysqlmanager.exe"
+ OutputFile="../../client_release/mysqlmanager.exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
SubSystem="1"
| Thread |
|---|
| • bk commit into 5.0 tree (kent:1.2213) BUG#19694 | kent | 30 Jun |
