diff options
| author | unknown <venu@myvenu.com> | 2003-06-03 20:59:32 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-06-03 20:59:32 -0700 |
| commit | f403a2967b85c1898e4d7c97c185601cfb2c4a33 (patch) | |
| tree | 0c63a76e645bd17fa2e854c9d6e3b91d1d0a7b78 /VC++Files | |
| parent | ff820c2724e01072db4d5e5c8e56cd4608c9ddb8 (diff) | |
| download | mariadb-git-f403a2967b85c1898e4d7c97c185601cfb2c4a33.tar.gz | |
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
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/client/mysqlclient.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index 95821052f8d..2f66d99b33c 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -104,6 +104,10 @@ SOURCE=..\mysys\charset.c # End Source File # Begin Source File +SOURCE=..\libmysql\client.c +# End Source File +# Begin Source File + SOURCE=.\completion_hash.cpp # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 24c85f403f7..d4f7ed6df82 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -123,6 +123,10 @@ SOURCE=..\mysys\charset.c # End Source File # Begin Source File +SOURCE=.\client.c +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-big5.c" # End Source File # Begin Source File diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index d548a44550c..a475c44e948 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -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 |