diff options
| author | unknown <georg@beethoven.site> | 2005-01-26 15:19:20 +0100 |
|---|---|---|
| committer | unknown <georg@beethoven.site> | 2005-01-26 15:19:20 +0100 |
| commit | 86016aeb45cee7182a3de818d9598aa9ebafe568 (patch) | |
| tree | 68d75442c49fa6d6fe4da814335b55c5dab50c04 /VC++Files/libmysqld | |
| parent | 99b8a16e4d550b53b317eb8cfd86d03f22c1e399 (diff) | |
| download | mariadb-git-86016aeb45cee7182a3de818d9598aa9ebafe568.tar.gz | |
Fixes for windows compilation bugs
(After review of cs georg:1.1800 by Monty)
VC++Files/libmysqld/libmysqld.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
VC++Files/mysqldemb/mysqldemb.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
extra/comp_err.c:
renamed DATADIR to DATADIRECTORY (DATADIR is a windows internal
enumeration type)
innobase/ut/ut0ut.c:
gettimeofday is not available under Windows. Added conditional define
which uses GetLocalTime for windows
libmysql/libmysql.c:
fixed prototype for setup_one_fetch_function which differed from
function declaration.
Fixed not supported unsigned __int64 to double conversion
sql/field.h:
fixed typecast error (windows)
sql/item_sum.cc:
fixed typecast errors (windows)
sql/key.cc:
fixed typecast errors (windows)
sql/opt_range.cc:
fixed not supported unsigned __int64 to double conversion
sql/sql_acl.cc:
fixed typecast errors (windows)
sql/table.cc:
fixed typecast errors (windows)
Diffstat (limited to 'VC++Files/libmysqld')
| -rw-r--r-- | VC++Files/libmysqld/libmysqld.dsp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index 99912228445..019589289cd 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -228,10 +228,6 @@ SOURCE=..\sql\ha_innodb.cpp # End Source File
# Begin Source File
-SOURCE=..\sql\ha_isammrg.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\sql\ha_myisam.cpp
# End Source File
# Begin Source File
|