diff options
| author | unknown <monty@mysql.com> | 2004-03-25 23:29:45 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-25 23:29:45 +0200 |
| commit | 9fbb59ecdb5807c93146f0772bbc8c770bba5747 (patch) | |
| tree | 7815fb40163d1db39e3991dcd19341ef57d08d74 /VC++Files | |
| parent | 719020af170c193cef3ce6b350d487de20a31c87 (diff) | |
| parent | e27b39393bd59129b796a0d30e4bedc95256b618 (diff) | |
| download | mariadb-git-9fbb59ecdb5807c93146f0772bbc8c770bba5747.tar.gz | |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
Auto merged
BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
Auto merged
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
VC++Files/strings/MASM6x/strings.dsp:
Auto merged
client/mysqldump.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/t/union.test:
Auto merged
mysql-test/t/update.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
sql/nt_servc.cc:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
sql/sql_base.cc:
Auto merged
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 |