bk commit into 5.0 tree (SergeyV:1.1960)

[sergeyv]

Below is the list of changes that have just been committed into a local
5.0 repository of sergeyv. When sergeyv 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.1960 05/11/14 15:19:52 SergeyV@selena. +3 -0
  Fixed number of compiler errors on win32.

  sql/spatial.cc
    1.25 05/11/14 15:18:41 SergeyV@selena. +2 -0
    Fixed compiler error for Win32 build. float8get should be enclosed
    in {} since it is macro on win32 and might cause unmatching blocks.

  sql/ha_innodb.cc
    1.276 05/11/14 15:18:41 SergeyV@selena. +2 -2
    Fixed compiler error for Win32 build. 

  VC++Files/mysqlbinlog/mysqlbinlog.vcproj
    1.2 05/11/14 15:18:40 SergeyV@selena. +1 -1
    Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.

# 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:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/bkt/mysql-5.0-rel

--- 1.24/sql/spatial.cc	2005-11-01 19:40:49 +03:00
+++ 1.25/sql/spatial.cc	2005-11-14 15:18:41 +03:00
@@ -178,7 +178,9 @@
 {
   double res;
   if (bo != Geometry::wkb_xdr)
+  {
     float8get(res, ptr);
+  }
   else
   {
     char inv_array[8];

--- 1.1/VC++Files/mysqlbinlog/mysqlbinlog.vcproj	2005-09-30 15:52:38 +04:00
+++ 1.2/VC++Files/mysqlbinlog/mysqlbinlog.vcproj	2005-11-14 15:18:40 +03:00
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="2"
-				AdditionalIncludeDirectories="../include,../,../sql"
+				AdditionalIncludeDirectories="../include,../,../sql,../strings"
 				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS;MYSQL_SERVER"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\Debug/mysqlbinlog.pch"

--- 1.275/sql/ha_innodb.cc	2005-10-25 10:57:09 +04:00
+++ 1.276/sql/ha_innodb.cc	2005-11-14 15:18:41 +03:00
@@ -3009,8 +3009,8 @@
 
 			if (key_part->length > 0 && cs->mbmaxlen > 1) {
 				len = (ulint) cs->cset->well_formed_len(cs, 
-					src_start,
-					src_start + key_part->length,
+					(const char *) src_start,
+					(const char *) src_start + key_part->length,
 					key_part->length / cs->mbmaxlen, 
 					&error);
 			} else {