diff options
| author | unknown <venu@myvenu.com> | 2003-06-03 18:45:07 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-06-03 18:45:07 -0700 |
| commit | fc59ec4eddbd4f6f518795dcd231b5343234350f (patch) | |
| tree | 6c667c83f599e122fe20111ffc01bf244d774111 /VC++Files | |
| parent | da9bf1dec30f9d1cda414d0a96ca93c11b1a77e7 (diff) | |
| download | mariadb-git-fc59ec4eddbd4f6f518795dcd231b5343234350f.tar.gz | |
Windows build fixups with the latest source
sql/item_cmpfunc.cc:
Remove unused variables
sql/mysqld.cc:
fix the defination as this is different from the prototype (cl compiler failed)
sql/sql_insert.cc:
fix the windows error (without cast)
sql/sql_show.cc:
Remove unused variables
include/config-win.h:
Fix for Windows build to go (charsets + collation default defs)
VC++Files/client/mysqlclient.dsp:
Take care of newly added/removed files
VC++Files/libmysql/libmysql.dsp:
Take care of newly added/removed files
VC++Files/sql/mysqld.dsp:
Take care of newly added/removed files
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/client/mysqlclient.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 10 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index 89976d7f77f..95821052f8d 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -430,10 +430,6 @@ SOURCE=..\mysys\safemalloc.c # End Source File # Begin Source File -SOURCE=.\select_test.c -# End Source File -# Begin Source File - SOURCE=..\mysys\sha1.c # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index bccb6d57c7f..24c85f403f7 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -215,10 +215,6 @@ SOURCE=.\libmysql.c # End Source File # Begin Source File -SOURCE=.\pack.c -# End Source File -# Begin Source File - SOURCE=.\Libmysql.def # End Source File # Begin Source File @@ -403,15 +399,15 @@ SOURCE=..\sql\net_serv.cpp # End Source File # Begin Source File -SOURCE=.\password.c +SOURCE=.\pack.c # End Source File # Begin Source File -SOURCE=..\mysys\safemalloc.c +SOURCE=.\password.c # End Source File # Begin Source File -SOURCE=..\client\select_test.c +SOURCE=..\mysys\safemalloc.c # End Source File # Begin Source File diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index e15d443a3b7..d548a44550c 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -486,6 +486,10 @@ SOURCE=.\item_func.cpp # End Source File # Begin Source File +SOURCE=.\item_geofunc.cpp +# End Source File +# Begin Source File + SOURCE=.\item_row.cpp # End Source File # Begin Source File @@ -742,6 +746,10 @@ SOURCE=.\OPT_SUM.cpp # End Source File # Begin Source File +SOURCE=.\pack.c +# End Source File +# Begin Source File + SOURCE=.\password.c !IF "$(CFG)" == "mysqld - Win32 Release" |