diff options
author | unknown <venu@myvenu.com> | 2003-06-03 18:45:53 -0700 |
---|---|---|
committer | unknown <venu@myvenu.com> | 2003-06-03 18:45:53 -0700 |
commit | ff820c2724e01072db4d5e5c8e56cd4608c9ddb8 (patch) | |
tree | 1880214478347ec771d96d2b41ffe284cb799b2c /VC++Files/libmysql/libmysql.dsp | |
parent | 0831433e8f8005331d68cd7edd708feb76dd3325 (diff) | |
parent | fc59ec4eddbd4f6f518795dcd231b5343234350f (diff) | |
download | mariadb-git-ff820c2724e01072db4d5e5c8e56cd4608c9ddb8.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'VC++Files/libmysql/libmysql.dsp')
-rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 10 |
1 files changed, 3 insertions, 7 deletions
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 |