diff options
| author | unknown <SergeyV@selena.> | 2005-11-14 15:19:52 +0300 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-11-14 15:19:52 +0300 |
| commit | 67df0e19e4cd17b7238d8ac2d4944324f889f1ba (patch) | |
| tree | 55751f0db1f06171a1f9f04bd7023e57e481c00b | |
| parent | 63bbb1513a73a0a556c8c7873cd6c9f5d610d652 (diff) | |
| download | mariadb-git-67df0e19e4cd17b7238d8ac2d4944324f889f1ba.tar.gz | |
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.
| -rw-r--r-- | VC++Files/mysqlbinlog/mysqlbinlog.vcproj | 2 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 4 | ||||
| -rw-r--r-- | sql/spatial.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/VC++Files/mysqlbinlog/mysqlbinlog.vcproj b/VC++Files/mysqlbinlog/mysqlbinlog.vcproj index 9d5d4db2565..bfe70d6d1af 100644 --- a/VC++Files/mysqlbinlog/mysqlbinlog.vcproj +++ b/VC++Files/mysqlbinlog/mysqlbinlog.vcproj @@ -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" diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 61af1afb2be..556186d5584 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -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 { diff --git a/sql/spatial.cc b/sql/spatial.cc index 5af1bec45ca..ca9615236e0 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -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]; |