mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Fix windows build after applyiing the changes from new client.c(sql-common)
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj and make sure to have the next changeset, which fixes this. sql/item_geofunc.cc: Fix warnings sql/sql_help.cc: Fix compiler errors sql-common/client.c: Delete and move redefination of shared memory stuff libmysql/libmysql.c: Fix for redefination stuff from client.c VC++Files/client/mysqlclient.dsp: add client.c VC++Files/libmysql/libmysql.dsp: add client.c VC++Files/sql/mysqld.dsp: add client.c and remove old convert.cpp and mini_client.c
This commit is contained in:
@ -178,7 +178,7 @@ LINK32=xilink6.exe
|
||||
# Name "mysqld - Win32 Max"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\convert.cpp
|
||||
SOURCE=.\client.c
|
||||
|
||||
!IF "$(CFG)" == "mysqld - Win32 Release"
|
||||
|
||||
@ -660,10 +660,6 @@ SOURCE=.\mf_iocache.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mini_client.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\myisammrg\myrg_rnext_same.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
Reference in New Issue
Block a user