Commit 67df0e19 authored by unknown's avatar unknown
Browse files

Fixed number of compiler errors on win32. 


VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.
sql/ha_innodb.cc:
  Fixed compiler error for Win32 build.
sql/spatial.cc:
  Fixed compiler error for Win32 build. float8get should be enclosed
  in {} since it is macro on win32 and might cause unmatching blocks.
parent 63bbb151

VC++Files/mysqlbinlog/mysqlbinlog.vcproj

+1 −1
Original line number Diff line number Diff line
@@ -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"

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -3009,8 +3009,8 @@ ha_innobase::store_key_val_for_row( 


			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 {

sql/spatial.cc

+2 −0
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ static double wkb_get_double(const char *ptr, Geometry::wkbByteOrder bo) 
{

  double res;

  if (bo != Geometry::wkb_xdr)

  {

    float8get(res, ptr);

  }

  else

  {

    char inv_array[8];