mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	Ensured that all projects compile Removed compiler warnings Better setting of server_version variable. Fix that make_win_src_distribution creates the privilege tables. VC++Files/bdb/bdb.dsp: Small, automatic changes VC++Files/client/mysql.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqladmin.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlclient.dsp: Removed files that should only be used with mysql command line client VC++Files/client/mysqldump.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlimport.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlshow.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/comp_err/comp_err.dsp: Automatic changes VC++Files/dbug/dbug.dsp: Automatic changes VC++Files/heap/heap.dsp: automatic changes VC++Files/innobase/innobase.dsp: Automatic changes VC++Files/isam/isam.dsp: Automatic changes VC++Files/isamchk/isamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysql/libmysql.dsp: Automatic changes VC++Files/libmysqld/examples/test_libmysqld.dsp: Add missing files VC++Files/libmysqld/libmysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysqltest/myTest.dsp: Automatic changes VC++Files/merge/merge.dsp: Automatic changes VC++Files/my_print_defaults/my_print_defaults.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisam/myisam.dsp: automatic changes VC++Files/myisam_ftdump/myisam_ftdump.dsp: automatic changes VC++Files/myisamchk/myisamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisamlog/myisamlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisammrg/myisammrg.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisampack/myisampack.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysql.dsw: Automatic changes VC++Files/mysqlbinlog/mysqlbinlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlcheck/mysqlcheck.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqldemb/mysqldemb.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlserver/mysqlserver.dsp: Automatic changes VC++Files/mysqlshutdown/mysqlshutdown.dsp: Automatic changes VC++Files/mysqlwatch/mysqlwatch.dsp: Automatic changes VC++Files/mysys/mysys.dsp: Automatic changes VC++Files/pack_isam/pack_isam.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/perror/perror.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/regex/regex.dsp: Automatic changes VC++Files/replace/replace.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/sql/mysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/strings/strings.dsp: Removed duplicate code for strnlen VC++Files/test1/test1.dsp: Automatic changes VC++Files/thr_test/thr_test.dsp: Automatic changes VC++Files/vio/vio.dsp: Automatic changes VC++Files/zlib/contrib/asm386/zlibvc.dsp: Automatic changes VC++Files/zlib/zlib.dsp: Automatic changes extra/my_print_defaults.c: Fixed bug in --verbose include/m_string.h: Portability fix include/mysql_embed.h: Better setting of server_version variable include/mysql_version.h.in: Better license text handling innobase/pars/pars0lex.l: Remove compiler warnings innobase/trx/trx0sys.c: Remove compiler warnings libmysqld/lib_sql.cc: Better setting of server_version variable libmysqld/libmysqld.def: Add functions needed for mysql command line client myisam/myisam_ftdump.c: Remove compiler warnings mysys/sha1.c: Remove compiler warnings scripts/make_win_src_distribution.sh: Safety fix scripts/mysql_install_db.sh: Backport from 4.1 to allow make_win_src_distribution create the privilege tables sql/Makefile.am: Add new file mysqld_suffix.h Remove not used file sql_olap.h sql/ha_innodb.cc: Remove not used variable sql/mysqld.cc: Better setting of server_version variable sql/set_var.cc: Fixed bug when showing lower_case_file_system strings/ctype-tis620.c: Remove compiler warnings
		
			
				
	
	
		
			135 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			135 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| # Microsoft Developer Studio Project File - Name="merge" - Package Owner=<4>
 | |
| # Microsoft Developer Studio Generated Build File, Format Version 6.00
 | |
| # ** DO NOT EDIT **
 | |
| 
 | |
| # TARGTYPE "Win32 (x86) Static Library" 0x0104
 | |
| 
 | |
| CFG=merge - Win32 Debug
 | |
| !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 | |
| !MESSAGE use the Export Makefile command and run
 | |
| !MESSAGE
 | |
| !MESSAGE NMAKE /f "merge.mak".
 | |
| !MESSAGE
 | |
| !MESSAGE You can specify a configuration when running NMAKE
 | |
| !MESSAGE by defining the macro CFG on the command line. For example:
 | |
| !MESSAGE
 | |
| !MESSAGE NMAKE /f "merge.mak" CFG="merge - Win32 Debug"
 | |
| !MESSAGE
 | |
| !MESSAGE Possible choices for configuration are:
 | |
| !MESSAGE
 | |
| !MESSAGE "merge - Win32 Release" (based on "Win32 (x86) Static Library")
 | |
| !MESSAGE "merge - Win32 Debug" (based on "Win32 (x86) Static Library")
 | |
| !MESSAGE
 | |
| 
 | |
| # Begin Project
 | |
| # PROP AllowPerConfigDependencies 0
 | |
| # PROP Scc_ProjName ""
 | |
| # PROP Scc_LocalPath ""
 | |
| CPP=xicl6.exe
 | |
| RSC=rc.exe
 | |
| 
 | |
| !IF  "$(CFG)" == "merge - Win32 Release"
 | |
| 
 | |
| # PROP BASE Use_MFC 0
 | |
| # PROP BASE Use_Debug_Libraries 0
 | |
| # PROP BASE Output_Dir "Release"
 | |
| # PROP BASE Intermediate_Dir "Release"
 | |
| # PROP BASE Target_Dir ""
 | |
| # PROP Use_MFC 0
 | |
| # PROP Use_Debug_Libraries 0
 | |
| # PROP Output_Dir "release"
 | |
| # PROP Intermediate_Dir "release"
 | |
| # PROP Target_Dir ""
 | |
| # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 | |
| # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
 | |
| # SUBTRACT CPP /YX
 | |
| # ADD BASE RSC /l 0x409
 | |
| # ADD RSC /l 0x409
 | |
| BSC32=bscmake.exe
 | |
| # ADD BASE BSC32 /nologo
 | |
| # ADD BSC32 /nologo
 | |
| LIB32=xilink6.exe -lib
 | |
| # ADD BASE LIB32 /nologo
 | |
| # ADD LIB32 /nologo /out:"..\lib_release\merge.lib"
 | |
| 
 | |
| !ELSEIF  "$(CFG)" == "merge - Win32 Debug"
 | |
| 
 | |
| # PROP BASE Use_MFC 0
 | |
| # PROP BASE Use_Debug_Libraries 1
 | |
| # PROP BASE Output_Dir "Debug"
 | |
| # PROP BASE Intermediate_Dir "Debug"
 | |
| # PROP BASE Target_Dir ""
 | |
| # PROP Use_MFC 0
 | |
| # PROP Use_Debug_Libraries 1
 | |
| # PROP Output_Dir "debug"
 | |
| # PROP Intermediate_Dir "debug"
 | |
| # PROP Target_Dir ""
 | |
| # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 | |
| # ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
 | |
| # SUBTRACT CPP /YX
 | |
| # ADD BASE RSC /l 0x409
 | |
| # ADD RSC /l 0x409
 | |
| BSC32=bscmake.exe
 | |
| # ADD BASE BSC32 /nologo
 | |
| # ADD BSC32 /nologo
 | |
| LIB32=xilink6.exe -lib
 | |
| # ADD BASE LIB32 /nologo
 | |
| # ADD LIB32 /nologo /out:"..\lib_debug\merge.lib"
 | |
| 
 | |
| !ENDIF
 | |
| 
 | |
| # Begin Target
 | |
| 
 | |
| # Name "merge - Win32 Release"
 | |
| # Name "merge - Win32 Debug"
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_close.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_create.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_delete.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_extra.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_info.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_locking.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_open.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_panic.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_rrnd.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_rsame.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_static.c
 | |
| # End Source File
 | |
| # Begin Source File
 | |
| 
 | |
| SOURCE=.\mrg_update.c
 | |
| # End Source File
 | |
| # End Target
 | |
| # End Project
 |