diff options
| author | unknown <lenz@mysql.com> | 2004-06-24 19:30:34 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-06-24 19:30:34 +0200 |
| commit | f53f8f72d4f40da2d089ad94fe6c2ee86819c085 (patch) | |
| tree | 19487d4e66f5d1db2b84d274fe899e3eb53bcc9b /VC++Files | |
| parent | 03d3b0a19ae611232bf1c44222fe3e89ed3cbdfd (diff) | |
| parent | fc28babbfb382b6269b525a3679bb6165666b15c (diff) | |
| download | mariadb-git-f53f8f72d4f40da2d089ad94fe6c2ee86819c085.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/innobase/innobase.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysqld/libmysqld.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp index a147fb3438c..0768b3095ea 100644 --- a/VC++Files/innobase/innobase.dsp +++ b/VC++Files/innobase/innobase.dsp @@ -368,6 +368,10 @@ SOURCE=.\row\row0vers.c # End Source File # Begin Source File +SOURCE=.\srv\srv0que.c +# End Source File +# Begin Source File + SOURCE=.\srv\srv0srv.c # End Source File # Begin Source File diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index 5a98b70c4c9..820ca30509c 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -568,6 +568,10 @@ SOURCE=..\sql\time.cpp # End Source File
# Begin Source File
+SOURCE=..\sql\tztime.cpp +# End Source File +# Begin Source File + SOURCE=..\sql\uniques.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index 62f7c0597cb..7c599113b6e 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -1820,6 +1820,10 @@ SOURCE=.\time.cpp # End Source File # Begin Source File +SOURCE=.\tztime.cpp +# End Source File +# Begin Source File + SOURCE=.\uniques.cpp # End Source File # Begin Source File |