diff options
| author | unknown <knielsen@mysql.com> | 2006-01-30 15:05:31 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-30 15:05:31 +0100 |
| commit | 5ab28d81f9dc873aca73df82448b186651535bec (patch) | |
| tree | b9712980f23d1bd6b9f19a72f1aadb35bd6f79d9 /VC++Files | |
| parent | baec0502079421421890574826701ffda6996ee6 (diff) | |
| parent | bf38d0077096280bea615feb1a77200a93fe2624 (diff) | |
| download | mariadb-git-5ab28d81f9dc873aca73df82448b186651535bec.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-merge
into mysql.com:/usr/local/mysql/mysql-5.1-merge
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
VC++Files/sql/mysqld.vcproj:
SCCS merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/client/mysqldump.vcproj | 27 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.vcproj | 75 |
2 files changed, 102 insertions, 0 deletions
diff --git a/VC++Files/client/mysqldump.vcproj b/VC++Files/client/mysqldump.vcproj index b6a33596083..39b83fd46f3 100644 --- a/VC++Files/client/mysqldump.vcproj +++ b/VC++Files/client/mysqldump.vcproj @@ -226,6 +226,33 @@ PreprocessorDefinitions=""/> </FileConfiguration> </File> + <File + RelativePath="my_user.c"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="classic|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> </Files> <Globals> </Globals> diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj index 6002fb5d815..b2d3cc43d33 100644 --- a/VC++Files/sql/mysqld.vcproj +++ b/VC++Files/sql/mysqld.vcproj @@ -3925,6 +3925,81 @@ </FileConfiguration> </File> <File + RelativePath="my_user.c"> + <FileConfiguration + Name="classic nt|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Max|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Max nt|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="nt|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="pro nt|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="pro|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="classic|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="..\storage\myisammrg\myrg_rnext_same.c"> <FileConfiguration Name="classic nt|Win32"> |