Commit 7ff2a5a5 authored by unknown's avatar unknown
Browse files

Removing mysqlshutdown and mysqlwatch from the Windows packages, removing their sources.

They were both undocumented and not much useful. Removal has been agreed with Mark, Miguel and MikeZ.
Removing winmysqladmin from the source (it was not included anymore in no Windows package). I'll do a test Windows noinstall.zip build before push.
MikeZ just removed mysqlshutdown and mysqlwatch from the installer scripts.


BitKeeper/deleted/.del-myshutdown.dsp~a8eee34a3d3ab679:
  Delete: VC++Files/mysqlshutdown/myshutdown.dsp
BitKeeper/deleted/.del-myshutdown_ia64.dsp~dd2ad23d744ba1ba:
  Delete: VC++Files/mysqlshutdown/myshutdown_ia64.dsp
BitKeeper/deleted/.del-mysql.ico~d4c55da4e911ced7:
  Delete: VC++Files/mysqlshutdown/mysql.ico
BitKeeper/deleted/.del-mysqlshutdown.c~35d5feec4507d810:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.dsp~27db1e088d39987c:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.dsp
BitKeeper/deleted/.del-mysqlshutdown.rc~454359c66381843c:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlshutdown_ia64.dsp~53fe7127af678bc:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
BitKeeper/deleted/.del-mysqlwatch.c~de504821ede1cb8:
  Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-mysqlwatch.dsp~4699ddfb6ed23a6d:
  Delete: VC++Files/mysqlwatch/mysqlwatch.dsp
BitKeeper/deleted/.del-mysqlwatch_ia64.dsp~1a11ce58f66a493:
  Delete: VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
BitKeeper/deleted/.del-db.cpp~6bbc3687ff8a2913:
  Delete: VC++Files/winmysqladmin/db.cpp
BitKeeper/deleted/.del-db.h~e38deaf45dffa24d:
  Delete: VC++Files/winmysqladmin/db.h
BitKeeper/deleted/.del-initsetup.cpp~b988f9ab7dbe4e92:
  Delete: VC++Files/winmysqladmin/initsetup.cpp
BitKeeper/deleted/.del-initsetup.h~bc2a39769765e1a5:
  Delete: VC++Files/winmysqladmin/initsetup.h
BitKeeper/deleted/.del-main.cpp~f822deb513ce0250:
  Delete: VC++Files/winmysqladmin/main.cpp
BitKeeper/deleted/.del-Goahead.ico~805e753b7f13c6b7:
  Delete: VC++Files/winmysqladmin/images/Goahead.ico
BitKeeper/deleted/.del-main.h~d17e73cf0b0cbf8:
  Delete: VC++Files/winmysqladmin/main.h
BitKeeper/deleted/.del-mysql.h~a538c356e526804b:
  Delete: VC++Files/winmysqladmin/mysql.h
BitKeeper/deleted/.del-mysql_com.h~8828acc269ca5036:
  Delete: VC++Files/winmysqladmin/mysql_com.h
BitKeeper/deleted/.del-mysql_version.h~674dd1127ee25880:
  Delete: VC++Files/winmysqladmin/mysql_version.h
BitKeeper/deleted/.del-winmysqladmin.cpp~bfac61f49813a983:
  Delete: VC++Files/winmysqladmin/winmysqladmin.cpp
BitKeeper/deleted/.del-HELP.ICO~6b91d6eff4a7b11e:
  Delete: VC++Files/winmysqladmin/images/HELP.ICO
BitKeeper/deleted/.del-INFO.ICO~b1eb08e87e0c1c3e:
  Delete: VC++Files/winmysqladmin/images/INFO.ICO
BitKeeper/deleted/.del-Info.bmp~9c3c5afea29fa9b7:
  Delete: VC++Files/winmysqladmin/images/Info.bmp
BitKeeper/deleted/.del-MYINI.ICO~91c77cc71d665f4:
  Delete: VC++Files/winmysqladmin/images/MYINI.ICO
BitKeeper/deleted/.del-Myini.bmp~6cea36edbb94df3a:
  Delete: VC++Files/winmysqladmin/images/Myini.bmp
BitKeeper/deleted/.del-Noentry.ico~6791fac163575069:
  Delete: VC++Files/winmysqladmin/images/Noentry.ico
BitKeeper/deleted/.del-SETUP.BMP~43bd1e614fc7e5d5:
  Delete: VC++Files/winmysqladmin/images/SETUP.BMP
BitKeeper/deleted/.del-Setup 16.bmp~9a9bf24a5dd952f3:
  Delete: VC++Files/winmysqladmin/images/Setup 16.bmp
BitKeeper/deleted/.del-Table.ico~d64bf78e407b5e50:
  Delete: VC++Files/winmysqladmin/images/Table.ico
BitKeeper/deleted/.del-Working.ico~f5cf304a7b6e592c:
  Delete: VC++Files/winmysqladmin/images/Working.ico
BitKeeper/deleted/.del-database.ico~df8562312d9d9ed8:
  Delete: VC++Files/winmysqladmin/images/database.ico
BitKeeper/deleted/.del-find.ico~44644ca5bab7901e:
  Delete: VC++Files/winmysqladmin/images/find.ico
BitKeeper/deleted/.del-green.ico~88749a9a4ff83d25:
  Delete: VC++Files/winmysqladmin/images/green.ico
BitKeeper/deleted/.del-help.bmp~bb6ac08cf7ab60d7:
  Delete: VC++Files/winmysqladmin/images/help.bmp
BitKeeper/deleted/.del-initsetup.cpp~6704e992d966647f:
  Delete: VC++Files/winmysqladmin/images/initsetup.cpp
BitKeeper/deleted/.del-killdb.ico~1043773bac9da67c:
  Delete: VC++Files/winmysqladmin/images/killdb.ico
BitKeeper/deleted/.del-logo.ico~f00b08cd64695232:
  Delete: VC++Files/winmysqladmin/images/logo.ico
BitKeeper/deleted/.del-multitrg.ico~52f787d7d9509533:
  Delete: VC++Files/winmysqladmin/images/multitrg.ico
BitKeeper/deleted/.del-mysql-07.bmp~c157a2c3573b5c27:
  Delete: VC++Files/winmysqladmin/images/mysql-07.bmp
BitKeeper/deleted/.del-mysql-17.bmp~99b3c90f96a9964b:
  Delete: VC++Files/winmysqladmin/images/mysql-17.bmp
BitKeeper/deleted/.del-mysql.BMP~b58fe4f0c416291:
  Delete: VC++Files/winmysqladmin/images/mysql.BMP
BitKeeper/deleted/.del-red.ico~179f5587e5a706c9:
  Delete: VC++Files/winmysqladmin/images/red.ico
BitKeeper/deleted/.del-red22.BMP~bc47efefee4a5a86:
  Delete: VC++Files/winmysqladmin/images/red22.BMP
BitKeeper/deleted/.del-see.bmp~c6863c3564387841:
  Delete: VC++Files/winmysqladmin/images/see.bmp
VC++Files/mysql.dsw:
  removing mysqlshutdown and mysqlwatch
VC++Files/mysql_ia64.dsw:
  removing mysqlshutdown and mysqlwatch
parent 982bd00d
Loading
Loading
Loading
Loading
+0 −24
Original line number Diff line number Diff line
@@ -537,30 +537,6 @@ Package=<4>

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

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

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

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

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

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

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

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

Package=<5>
+0 −24
Original line number Diff line number Diff line
@@ -640,30 +640,6 @@ Package=<4>

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

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

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

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

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

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

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

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

Package=<5>
+0 −101
Original line number Diff line number Diff line
# Microsoft Developer Studio Project File - Name="myshutdown" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Application" 0x0101

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

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

!IF  "$(CFG)" == "myshutdown - 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" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /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 /nologo /subsystem:windows /machine:I386
# ADD 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 /nologo /subsystem:windows /machine:I386

!ELSEIF  "$(CFG)" == "myshutdown - 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 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD 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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

!ENDIF

# Begin Target

# Name "myshutdown - Win32 Release"
# Name "myshutdown - Win32 Debug"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# 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
+0 −101
Original line number Diff line number Diff line
# Microsoft Developer Studio Project File - Name="myshutdown" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Application" 0x0101

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

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

!IF  "$(CFG)" == "myshutdown - WinIA64 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 "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3   /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /YX /FD /c /O2 /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /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  /nologo /subsystem:windows /machine:IA64
# ADD 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  /nologo /subsystem:windows /machine:IA64 /incremental:no

!ELSEIF  "$(CFG)" == "myshutdown - WinIA64 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 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm    /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /YX /FD /GZ /c /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
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  /nologo /subsystem:windows /debug /machine:IA64 
# ADD 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  /nologo /subsystem:windows /debug /machine:IA64 /incremental:no

!ENDIF

# Begin Target

# Name "myshutdown - WinIA64 Release"
# Name "myshutdown - WinIA64 Debug"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# 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/mysqlshutdown/mysql.ico

deleted100644 → 0
−318 B
Loading image diff...
Loading