manual merge (94c32876) · Commits · Software / OSDI20 Artifacts / mariadb

VC++Files/client/mysql_upgrade.dsp

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		# Microsoft Developer Studio Project File - Name="mysql_upgrade" - Package Owner=<4>
		# Microsoft Developer Studio Generated Build File, Format Version 6.00
		# DO NOT EDIT

		# TARGTYPE "Win32 (x86) Console Application" 0x0103

		CFG=mysql_upgrade - Win32 Release
		!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 "mysql_upgrade.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 "mysql_upgrade.mak" CFG="mysql_upgrade - Win32 Release"
		!MESSAGE
		!MESSAGE Possible choices for configuration are:
		!MESSAGE
		!MESSAGE "mysql_upgrade - Win32 Release" (based on "Win32 (x86) Console Application")
		!MESSAGE

		# Begin Project
		# PROP AllowPerConfigDependencies 0
		# PROP Scc_ProjName ""
		# PROP Scc_LocalPath ""
		CPP=cl.exe
		RSC=rc.exe
		# PROP BASE Use_MFC 0
		# PROP BASE Use_Debug_Libraries 0
		# PROP BASE Output_Dir "mysql_upgrade___Win32_Release"
		# PROP BASE Intermediate_Dir "mysql_upgrade___Win32_Release"
		# PROP BASE Target_Dir ""
		# PROP Use_MFC 0
		# PROP Use_Debug_Libraries 0
		# PROP Output_Dir "mysql_upgrade___Win32_Release"
		# PROP Intermediate_Dir "mysql_upgrade___Win32_Release"
		# PROP Ignore_Export_Lib 0
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /Fp"Release/mysql_upgrade.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c
		# ADD BASE RSC /l 0x416 /d "NDEBUG"
		# ADD RSC /l 0x416 /d "NDEBUG"
		BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib /nologo /subsystem:console /pdb:"release/mysql_upgrade.pdb" /machine:I386 /out:"../client_release/mysql_upgrade.exe" /libpath:"..\lib_release\\"
		# SUBTRACT LINK32 /pdb:none
		# Begin Target

		# Name "mysql_upgrade - Win32 Release"
		# Begin Group "Source Files"

		# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
		# Begin Source File

		SOURCE=.\mysql_upgrade.c
		# End Source File
		# End Group
		# Begin Group "Header Files"

		# PROP Default_Filter "h;hpp;hxx;hm;inl"
		# End Group
		# Begin Group "Resource Files"

		# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
		# End Group
		# End Target
		# End Project

VC++Files/client/mysql_upgrade_ia64.dsp

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		# Microsoft Developer Studio Project File - Name="mysql_upgrade" - Package Owner=<4>
		# Microsoft Developer Studio Generated Build File, Format Version 6.00
		# DO NOT EDIT

		# TARGTYPE "Win32 (x86) Console Application" 0x0103

		CFG=mysql_upgrade - Win32 Release
		!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 "mysql_upgrade.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 "mysql_upgrade.mak" CFG="mysql_upgrade - Win32 Release"
		!MESSAGE
		!MESSAGE Possible choices for configuration are:
		!MESSAGE
		!MESSAGE "mysql_upgrade - WinIA64 Release" (based on "Win32 (x86) Console Application")
		!MESSAGE

		# Begin Project
		# PROP AllowPerConfigDependencies 0
		# PROP Scc_ProjName ""
		# PROP Scc_LocalPath ""
		CPP=cl.exe
		RSC=rc.exe

		!IF "$(CFG)" == "mysql - WinIA64 Release"

		# PROP BASE Use_MFC 0
		# PROP BASE Use_Debug_Libraries 0
		# PROP BASE Output_Dir "mysql_upgrade___WinIA64_Release"
		# PROP BASE Intermediate_Dir "mysql_upgrade___WinIA64_Release"
		# PROP BASE Target_Dir ""
		# PROP Use_MFC 0
		# PROP Use_Debug_Libraries 0
		# PROP Output_Dir "mysql_upgrade___WinIA64_Release"
		# PROP Intermediate_Dir "mysql_upgrade___WinIA64_Release"
		# PROP Ignore_Export_Lib 0
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
		# ADD CPP /nologo /MT /W3 /I "../include" /D"NDEBUG" /D"DBUG_OFF" /D"_CONSOLE" /D"_MBCS" /D"_WINDOWS" /Fp"Release/mysql_upgrade.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c /O2 /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
		# ADD BASE RSC /l 0x416 /d "NDEBUG"
		# ADD RSC /l 0x416 /d "NDEBUG"
		BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=link.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
		# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib zlib.lib /nologo /subsystem:console /pdb:"release/mysql_upgrade.pdb" /machine:IA64 /out:"../client_release/mysql_upgrade.exe" /libpath:"..\lib_release\\" /incremental:no
		# SUBTRACT LINK32

		!ENDIF

		# Begin Target

		# Name "mysql_upgrade - WinIA64 Release"
		# Begin Group "Source Files"

		# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
		# Begin Source File

		SOURCE=.\mysql_upgrade.c
		# End Source File
		# End Group
		# Begin Group "Header Files"

		# PROP Default_Filter "h;hpp;hxx;hm;inl"
		# End Group
		# Begin Group "Resource Files"

		# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
		# End Group
		# End Target
		# End Project

VC++Files/mysql.dsw

+25 −0

Original line number	Diff line number	Diff line
		@@ -339,6 +339,27 @@ Package=<4>

		###############################################################################

		Project: "mysql_upgrade"=".\client\mysql_upgrade.dsp" - Package Owner=<4>

		Package=<5>
		{{{
		}}}

		Package=<4>
		{{{
		Begin Project Dependency
		Project_Dep_Name mysqlclient
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name zlib
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysys
		End Project Dependency
		}}}

		###############################################################################

		Project: "mysqlbinlog"=".\mysqlbinlog\mysqlbinlog.dsp" - Package Owner=<4>

		Package=<5>
		@@ -415,6 +436,8 @@ Package=<4>
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysqladmin
		Begin Project Dependency
		Project_Dep_Name myqsl_upgrade
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysqldump
		@@ -802,6 +825,8 @@ Package=<4>
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysqladmin
		Begin Project Dependency
		Project_Dep_Name mysql_upgrade
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysql_client_test

VC++Files/mysql_ia64.dsw

+20 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,24 @@ Package=<4>

		###############################################################################

		Project: "mysql_upgrade"=".\client\mysql_upgrade_ia64.dsp" - Package Owner=<4>

		Package=<5>
		{{{
		}}}

		Package=<4>
		{{{
		Begin Project Dependency
		Project_Dep_Name mysqlclient
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name zlib
		End Project Dependency
		}}}

		###############################################################################

		Project: "mysqlbinlog"=".\mysqlbinlog\mysqlbinlog_ia64.dsp" - Package Owner=<4>

		Package=<5>
		@@ -500,6 +518,8 @@ Package=<4>
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysqladmin_ia64
		Begin Project Dependency
		Project_Dep_Name mysql_upgrade_ia64
		End Project Dependency
		Begin Project Dependency
		Project_Dep_Name mysqldump

client/Makefile.am

+5 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
		bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
		mysqldump mysqlimport mysqltest mysqlbinlog \
		mysqltestmanagerc mysqltestmanager-pwgen \
		mysqlslap
		mysqlslap mysql_upgrade
		noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
		client_priv.h
		mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
		@@ -72,11 +72,14 @@ mysqlslap_SOURCES= mysqlslap.c \
		mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix)
		mysqlimport_SOURCES= mysqlimport.c \
		$(yassl_dummy_link_fix)
		mysql_upgrade_SOURCES= mysql_upgrade.c $(yassl_dummy_link_fix)
		sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
		strings_src=decimal.c

		# Fix for mit-threads
		DEFS = -DUNDEF_THREADS_HACK
		DEFS = -DUNDEF_THREADS_HACK \
		-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
		-DDATADIR="\"$(localstatedir)\""
		EXTRA_DIST = get_password.c cmakelists.txt

		link_sources: