diff options
author | monty@mysql.com <> | 2004-03-25 23:29:45 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2004-03-25 23:29:45 +0200 |
commit | e0e0314d606399778f595d33a191c248f15cb4c2 (patch) | |
tree | 7815fb40163d1db39e3991dcd19341ef57d08d74 /VC++Files | |
parent | 3b34a6a2dd73792e1b79047a491bd02b30d5ec68 (diff) | |
parent | 488fe61074a83ff31e6ac2f609ba596f903f4d4d (diff) | |
download | mariadb-git-e0e0314d606399778f595d33a191c248f15cb4c2.tar.gz |
Merge with 4.0
Diffstat (limited to 'VC++Files')
-rw-r--r-- | VC++Files/innobase/innobase.dsp | 8 | ||||
-rw-r--r-- | VC++Files/strings/MASM6x/strings.dsp | 4 | ||||
-rw-r--r-- | VC++Files/strings/strings.dsp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp index e32f242be80..713e3153d17 100644 --- a/VC++Files/innobase/innobase.dsp +++ b/VC++Files/innobase/innobase.dsp @@ -168,14 +168,6 @@ SOURCE=.\buf\buf0rea.c # End Source File # Begin Source File -SOURCE=.\com\com0com.c -# End Source File -# Begin Source File - -SOURCE=.\com\com0shm.c -# End Source File -# Begin Source File - SOURCE=.\data\data0data.c # End Source File # Begin Source File diff --git a/VC++Files/strings/MASM6x/strings.dsp b/VC++Files/strings/MASM6x/strings.dsp index 1c5ce5249f5..e7b1c161d83 100644 --- a/VC++Files/strings/MASM6x/strings.dsp +++ b/VC++Files/strings/MASM6x/strings.dsp @@ -156,6 +156,10 @@ SOURCE=.\str2int.c # End Source File # Begin Source File +SOURCE=.\strnlen.c +# End Source File +# Begin Source File + SOURCE=.\Strings.asm !IF "$(CFG)" == "strings - Win32 Release" diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp index ffec20f3a59..5755d5d4c99 100644 --- a/VC++Files/strings/strings.dsp +++ b/VC++Files/strings/strings.dsp @@ -188,6 +188,10 @@ SOURCE=.\longlong2str.c # End Source File # Begin Source File +SOURCE=.\strnlen.c +# End Source File +# Begin Source File + SOURCE=.\my_strtoll10.c # End Source File # Begin Source File |