Merge mysql.com:/my/mysql-4.0

into mysql.com:/space/my/mysql-4.0-automake

BitKeeper/etc/logging_ok

@@ -84,3 +84,4 @@ zak@linux.local
 zgreant@mysql.com
 tfr@beta.frontier86.ee
 Administrador@light.
+mwagner@work.mysql.com

Docs/bk.txt

 Mail by sasha, should be rewritten as a HOWTO sometimes
+vva added point C) for Windows-project
 -----------
 
 I have set up a repository with BitKeeper on work. There are still some things
@@ -29,6 +30,12 @@ you will need just to set up a slave repository on your machine:
 Now you have the entire source tree in the current directory. Let's compile it:
 
  BUILD/compile-pentium-debug
+ 
+C) Windows project. 
+   - Compile Linux-project (see points above)
+   - run VC++Files/prepare
+   - make repository accessible for Windows (using samba)
+   - open VC++Files/mysql.dsw in Microsoft Visual Stidio (5.0 or above)
 
 After you edit a file, you need to check it in using bk citool or bk ci
 filename. Note that ci is different than commit - you ci a file, but you commit

VC++Files/mysqlbinlog/mysqlbinlog.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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" /I "../" /I "../sql" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../client" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /I "../sql" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /I "../client" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -88,7 +88,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\client\mysqlbinlog.cpp
+SOURCE=.\mysqlbinlog.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"

VC++Files/mysqlmanager/CHILDFRM.CPP

+// ChildFrm.cpp : implementation of the CChildFrame class
+//
+
+#include "stdafx.h"
+#include "MySqlManager.h"
+
+#include "ChildFrm.h"
+
+#ifdef _DEBUG
+   #define new DEBUG_NEW
+   #undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CChildFrame
+
+IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWnd)
+
+BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWnd)
+//{{AFX_MSG_MAP(CChildFrame)
+// NOTE - the ClassWizard will add and remove mapping macros here.
+//    DO NOT EDIT what you see in these blocks of generated code !
+//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CChildFrame construction/destruction
+
+CChildFrame::CChildFrame()
+{
+   // TODO: add member initialization code here
+
+}
+
+CChildFrame::~CChildFrame()
+{
+}
+
+BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs)
+{
+   // TODO: Modify the Window class or styles here by modifying
+   //  the CREATESTRUCT cs
+
+   return CMDIChildWnd::PreCreateWindow(cs);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CChildFrame diagnostics
+
+#ifdef _DEBUG
+void CChildFrame::AssertValid() const
+{
+   CMDIChildWnd::AssertValid();
+}
+
+void CChildFrame::Dump(CDumpContext& dc) const
+{
+   CMDIChildWnd::Dump(dc);
+}
+
+#endif //_DEBUG
+
+/////////////////////////////////////////////////////////////////////////////
+// CChildFrame message handlers

VC++Files/mysqlmanager/CHILDFRM.H

+// ChildFrm.h : interface of the CChildFrame class
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_CHILDFRM_H__826CB2F0_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_CHILDFRM_H__826CB2F0_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+class CChildFrame : public CMDIChildWnd
+{
+	DECLARE_DYNCREATE(CChildFrame)
+public:
+	CChildFrame();
+
+// Attributes
+public:
+
+// Operations
+public:
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CChildFrame)
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	//}}AFX_VIRTUAL
+
+// Implementation
+public:
+	virtual ~CChildFrame();
+#ifdef _DEBUG
+	virtual void AssertValid() const;
+	virtual void Dump(CDumpContext& dc) const;
+#endif
+
+// Generated message map functions
+protected:
+	//{{AFX_MSG(CChildFrame)
+		// NOTE - the ClassWizard will add and remove member functions here.
+		//    DO NOT EDIT what you see in these blocks of generated code!
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_CHILDFRM_H__826CB2F0_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/MAINFRM.CPP

+// MainFrm.cpp : implementation of the CMainFrame class
+//
+
+#include "stdafx.h"
+#include "MySqlManager.h"
+#include "MainFrm.h"
+
+CMainFrame* CMainFrame::g_pMainFrame = NULL;
+
+#ifdef _DEBUG
+   #define new DEBUG_NEW
+   #undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame
+
+IMPLEMENT_DYNAMIC(CMainFrame, CMDIFrameWnd)
+
+BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
+//{{AFX_MSG_MAP(CMainFrame)
+// NOTE - the ClassWizard will add and remove mapping macros here.
+//    DO NOT EDIT what you see in these blocks of generated code !
+	ON_WM_CREATE()
+//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+static UINT indicators[] =
+{
+   ID_SEPARATOR,           // status line indicator
+   ID_INDICATOR_CAPS,
+   ID_INDICATOR_NUM,
+   ID_INDICATOR_SCRL,
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame construction/destruction
+
+CMainFrame::CMainFrame()
+{
+   // TODO: add member initialization code here
+
+}
+
+CMainFrame::~CMainFrame()
+{
+}
+
+int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
+{
+   if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1)
+      return -1;
+
+   if (!m_wndToolBar.Create(this) ||
+       !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
+   {
+      TRACE0("Failed to create toolbar\n");
+      return -1;      // fail to create
+   }
+
+   if (!m_wndStatusBar.Create(this) ||
+       !m_wndStatusBar.SetIndicators(indicators,
+                                     sizeof(indicators)/sizeof(UINT)))
+   {
+      TRACE0("Failed to create status bar\n");
+      return -1;      // fail to create
+   }
+
+   // TODO: Remove this if you don't want tool tips or a resizeable toolbar
+   m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
+                            CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
+
+   // TODO: Delete these three lines if you don't want the toolbar to
+   //  be dockable
+   m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
+   EnableDocking(CBRS_ALIGN_ANY);
+   DockControlBar(&m_wndToolBar);
+
+   return 0;
+}
+
+BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
+{
+   // TODO: Modify the Window class or styles here by modifying
+   //  the CREATESTRUCT cs
+
+   return CMDIFrameWnd::PreCreateWindow(cs);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame diagnostics
+
+#ifdef _DEBUG
+void CMainFrame::AssertValid() const
+{
+   CMDIFrameWnd::AssertValid();
+}
+
+void CMainFrame::Dump(CDumpContext& dc) const
+{
+   CMDIFrameWnd::Dump(dc);
+}
+
+#endif //_DEBUG
+
+/////////////////////////////////////////////////////////////////////////////
+// CMainFrame message handlers
+
+int CMainFrame::StatusMsg ( LPCSTR fmt, ... )
+
+{
+
+   char buf [2048];
+   va_list args;
+   va_start(args, fmt);
+   int ret = vsprintf(buf, fmt, args);
+
+   if ( this != NULL )
+   {
+      static char g_StatusMsg_Buffer_TT [ 2048 ];
+      memcpy ( g_StatusMsg_Buffer_TT, buf, sizeof(g_StatusMsg_Buffer_TT) );
+      m_wndStatusBar.SetPaneText ( 0, buf );
+      m_wndStatusBar.UpdateWindow ();
+   }
+
+   va_end(args);
+   return ( ret );
+
+}
+
+
+BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext)
+{
+   g_pMainFrame = this;
+   return CMDIFrameWnd::OnCreateClient(lpcs, pContext);
+}

VC++Files/mysqlmanager/MAINFRM.H

+// MainFrm.h : interface of the CMainFrame class
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_MAINFRM_H__826CB2EE_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_MAINFRM_H__826CB2EE_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+class CMainFrame : public CMDIFrameWnd
+{
+	DECLARE_DYNAMIC(CMainFrame)
+public:
+	CMainFrame();
+
+// Attributes
+public:
+
+// Operations
+public:
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CMainFrame)
+	public:
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	protected:
+	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext);
+	//}}AFX_VIRTUAL
+
+// Implementation
+public:
+	virtual ~CMainFrame();
+#ifdef _DEBUG
+	virtual void AssertValid() const;
+	virtual void Dump(CDumpContext& dc) const;
+#endif
+
+   int   StatusMsg ( LPCSTR fmt, ... );
+
+protected:  // control bar embedded members
+	CStatusBar  m_wndStatusBar;
+	CToolBar    m_wndToolBar;
+
+// Generated message map functions
+protected:
+	//{{AFX_MSG(CMainFrame)
+	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+		// NOTE - the ClassWizard will add and remove member functions here.
+		//    DO NOT EDIT what you see in these blocks of generated code!
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+public:
+
+static CMainFrame* g_pMainFrame;
+
+};
+
+#define MainFrame ( CMainFrame::g_pMainFrame ? CMainFrame::g_pMainFrame : (CMainFrame*) AfxGetMainWnd() -> GetTopLevelFrame() )
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_MAINFRM_H__826CB2EE_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/MySqlManager.mak

+# Microsoft Developer Studio Generated NMAKE File, Based on MySqlManager.dsp
+!IF "$(CFG)" == ""
+CFG=MySqlManager - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to MySqlManager - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "MySqlManager - Win32 Release" && "$(CFG)" != "MySqlManager - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!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 "MySqlManager.mak" CFG="MySqlManager - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "MySqlManager - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "MySqlManager - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "MySqlManager - Win32 Release"
+
+OUTDIR=.\release
+INTDIR=.\release
+# Begin Custom Macros
+OutDir=.\release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\client_release\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch"
+
+!ELSE 
+
+ALL : "mysqlclient - Win32 Release" "..\client_release\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"mysqlclient - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\ChildFrm.obj"
+	-@erase "$(INTDIR)\MainFrm.obj"
+	-@erase "$(INTDIR)\MySqlManager.obj"
+	-@erase "$(INTDIR)\MySqlManager.pch"
+	-@erase "$(INTDIR)\MySqlManager.res"
+	-@erase "$(INTDIR)\MySqlManagerDoc.obj"
+	-@erase "$(INTDIR)\MySqlManagerView.obj"
+	-@erase "$(INTDIR)\RegisterServer.obj"
+	-@erase "$(INTDIR)\StdAfx.obj"
+	-@erase "$(INTDIR)\ToolSql.obj"
+	-@erase "$(INTDIR)\ToolSqlQuery.obj"
+	-@erase "$(INTDIR)\ToolSqlResults.obj"
+	-@erase "$(INTDIR)\ToolSqlStatus.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "..\client_release\MySqlManager.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MT /W3 /GX /O1 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\MySqlManager.res" /d "NDEBUG" /d "_AFXDLL" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\MySqlManager.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=/nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\MySqlManager.pdb" /machine:I386 /out:"../client_release/MySqlManager.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\ChildFrm.obj" \
+	"$(INTDIR)\MainFrm.obj" \
+	"$(INTDIR)\MySqlManager.obj" \
+	"$(INTDIR)\MySqlManagerDoc.obj" \
+	"$(INTDIR)\MySqlManagerView.obj" \
+	"$(INTDIR)\RegisterServer.obj" \
+	"$(INTDIR)\StdAfx.obj" \
+	"$(INTDIR)\ToolSql.obj" \
+	"$(INTDIR)\ToolSqlQuery.obj" \
+	"$(INTDIR)\ToolSqlResults.obj" \
+	"$(INTDIR)\ToolSqlStatus.obj" \
+	"$(INTDIR)\MySqlManager.res" \
+	"..\lib_release\mysqlclient.lib"
+
+"..\client_release\MySqlManager.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "MySqlManager - Win32 Debug"
+
+OUTDIR=.\debug
+INTDIR=.\debug
+# Begin Custom Macros
+OutDir=.\debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "..\client_debug\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch"
+
+!ELSE 
+
+ALL : "mysqlclient - Win32 Debug" "..\client_debug\MySqlManager.exe" "$(OUTDIR)\MySqlManager.pch"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"mysqlclient - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\ChildFrm.obj"
+	-@erase "$(INTDIR)\MainFrm.obj"
+	-@erase "$(INTDIR)\MySqlManager.obj"
+	-@erase "$(INTDIR)\MySqlManager.pch"
+	-@erase "$(INTDIR)\MySqlManager.res"
+	-@erase "$(INTDIR)\MySqlManagerDoc.obj"
+	-@erase "$(INTDIR)\MySqlManagerView.obj"
+	-@erase "$(INTDIR)\RegisterServer.obj"
+	-@erase "$(INTDIR)\StdAfx.obj"
+	-@erase "$(INTDIR)\ToolSql.obj"
+	-@erase "$(INTDIR)\ToolSqlQuery.obj"
+	-@erase "$(INTDIR)\ToolSqlResults.obj"
+	-@erase "$(INTDIR)\ToolSqlStatus.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(OUTDIR)\MySqlManager.pdb"
+	-@erase "..\client_debug\MySqlManager.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+MTL_PROJ=/nologo /D "_DEBUG" /o "NUL" /win32 
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\MySqlManager.res" /d "_DEBUG" 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\MySqlManager.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\MySqlManager.pdb" /debug /machine:I386 /out:"../client_debug/MySqlManager.exe" /pdbtype:sept /libpath:"..\lib_debug\\" 
+LINK32_OBJS= \
+	"$(INTDIR)\ChildFrm.obj" \
+	"$(INTDIR)\MainFrm.obj" \
+	"$(INTDIR)\MySqlManager.obj" \
+	"$(INTDIR)\MySqlManagerDoc.obj" \
+	"$(INTDIR)\MySqlManagerView.obj" \
+	"$(INTDIR)\RegisterServer.obj" \
+	"$(INTDIR)\StdAfx.obj" \
+	"$(INTDIR)\ToolSql.obj" \
+	"$(INTDIR)\ToolSqlQuery.obj" \
+	"$(INTDIR)\ToolSqlResults.obj" \
+	"$(INTDIR)\ToolSqlStatus.obj" \
+	"$(INTDIR)\MySqlManager.res" \
+	"..\lib_debug\mysqlclient.lib"
+
+"..\client_debug\MySqlManager.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("MySqlManager.dep")
+!INCLUDE "MySqlManager.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "MySqlManager.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "MySqlManager - Win32 Release" || "$(CFG)" == "MySqlManager - Win32 Debug"
+SOURCE=.\ChildFrm.cpp
+
+"$(INTDIR)\ChildFrm.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\MainFrm.cpp
+
+"$(INTDIR)\MainFrm.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\MySqlManager.cpp
+
+"$(INTDIR)\MySqlManager.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\MySqlManager.rc
+
+"$(INTDIR)\MySqlManager.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+SOURCE=.\MySqlManagerDoc.cpp
+
+"$(INTDIR)\MySqlManagerDoc.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\MySqlManagerView.cpp
+
+"$(INTDIR)\MySqlManagerView.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\RegisterServer.cpp
+
+"$(INTDIR)\RegisterServer.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\StdAfx.cpp
+
+!IF  "$(CFG)" == "MySqlManager - Win32 Release"
+
+CPP_SWITCHES=/nologo /G6 /MT /W3 /GX /O1 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /Fp"$(INTDIR)\MySqlManager.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\MySqlManager.pch" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF  "$(CFG)" == "MySqlManager - Win32 Debug"
+
+CPP_SWITCHES=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\MySqlManager.pch" /Yc"stdafx.h" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+"$(INTDIR)\StdAfx.obj"	"$(INTDIR)\MySqlManager.pch" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF 
+
+SOURCE=.\ToolSql.cpp
+
+"$(INTDIR)\ToolSql.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\ToolSqlQuery.cpp
+
+"$(INTDIR)\ToolSqlQuery.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\ToolSqlResults.cpp
+
+"$(INTDIR)\ToolSqlResults.obj" : $(SOURCE) "$(INTDIR)"
+
+
+SOURCE=.\ToolSqlStatus.cpp
+
+"$(INTDIR)\ToolSqlStatus.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!IF  "$(CFG)" == "MySqlManager - Win32 Release"
+
+"mysqlclient - Win32 Release" : 
+   cd "\MYSQL-3.23\client"
+   $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Release" 
+   cd "..\mysqlmanager"
+
+"mysqlclient - Win32 ReleaseCLEAN" : 
+   cd "\MYSQL-3.23\client"
+   $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\mysqlmanager"
+
+!ELSEIF  "$(CFG)" == "MySqlManager - Win32 Debug"
+
+"mysqlclient - Win32 Debug" : 
+   cd "\MYSQL-3.23\client"
+   $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Debug" 
+   cd "..\mysqlmanager"
+
+"mysqlclient - Win32 DebugCLEAN" : 
+   cd "\MYSQL-3.23\client"
+   $(MAKE) /$(MAKEFLAGS) /F ".\mysqlclient.mak" CFG="mysqlclient - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\mysqlmanager"
+
+!ENDIF 
+
+
+!ENDIF 
+

VC++Files/mysqlmanager/README.TXT

+========================================================================
+       MICROSOFT FOUNDATION CLASS LIBRARY : MySqlManager
+========================================================================
+
+
+AppWizard has created this MySqlManager application for you.  This application
+not only demonstrates the basics of using the Microsoft Foundation classes
+but is also a starting point for writing your application.
+
+This file contains a summary of what you will find in each of the files that
+make up your MySqlManager application.
+
+MySqlManager.h
+    This is the main header file for the application.  It includes other
+    project specific headers (including Resource.h) and declares the
+    CMySqlManagerApp application class.
+
+MySqlManager.cpp
+    This is the main application source file that contains the application
+    class CMySqlManagerApp.
+
+MySqlManager.rc
+    This is a listing of all of the Microsoft Windows resources that the
+    program uses.  It includes the icons, bitmaps, and cursors that are stored
+    in the RES subdirectory.  This file can be directly edited in Microsoft
+	Developer Studio.
+
+res\MySqlManager.ico
+    This is an icon file, which is used as the application's icon.  This
+    icon is included by the main resource file MySqlManager.rc.
+
+res\MySqlManager.rc2
+    This file contains resources that are not edited by Microsoft
+	Developer Studio.  You should place all resources not
+	editable by the resource editor in this file.
+
+MySqlManager.clw
+    This file contains information used by ClassWizard to edit existing
+    classes or add new classes.  ClassWizard also uses this file to store
+    information needed to create and edit message maps and dialog data
+    maps and to create prototype member functions.
+
+/////////////////////////////////////////////////////////////////////////////
+
+For the main frame window:
+
+MainFrm.h, MainFrm.cpp
+    These files contain the frame class CMainFrame, which is derived from
+    CMDIFrameWnd and controls all MDI frame features.
+
+res\Toolbar.bmp
+    This bitmap file is used to create tiled images for the toolbar.
+    The initial toolbar and status bar are constructed in the
+    CMainFrame class.  Edit this toolbar bitmap along with the
+    array in MainFrm.cpp to add more toolbar buttons.
+
+/////////////////////////////////////////////////////////////////////////////
+
+AppWizard creates one document type and one view:
+
+MySqlManagerDoc.h, MySqlManagerDoc.cpp - the document
+    These files contain your CMySqlManagerDoc class.  Edit these files to
+    add your special document data and to implement file saving and loading
+    (via CMySqlManagerDoc::Serialize).
+
+MySqlManagerView.h, MySqlManagerView.cpp - the view of the document
+    These files contain your CMySqlManagerView class.
+    CMySqlManagerView objects are used to view CMySqlManagerDoc objects.
+
+res\MySqlManagerDoc.ico
+    This is an icon file, which is used as the icon for MDI child windows
+    for the CMySqlManagerDoc class.  This icon is included by the main
+    resource file MySqlManager.rc.
+
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+    These files are used to build a precompiled header (PCH) file
+    named MySqlManager.pch and a precompiled types file named StdAfx.obj.
+
+Resource.h
+    This is the standard header file, which defines new resource IDs.
+    Microsoft Developer Studio reads and updates this file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" to indicate parts of the source code you
+should add to or customize.
+
+If your application uses MFC in a shared DLL, and your application is
+in a language other than the operating system's current language, you
+will need to copy the corresponding localized resources MFC40XXX.DLL
+from the Microsoft Visual C++ CD-ROM onto the system or system32 directory,
+and rename it to be MFCLOC.DLL.  ("XXX" stands for the language abbreviation.
+For example, MFC40DEU.DLL contains resources translated to German.)  If you
+don't do this, some of the UI elements of your application will remain in the
+language of the operating system.
+
+/////////////////////////////////////////////////////////////////////////////

VC++Files/mysqlmanager/RES/mysqlmanager.rc2

+//
+// MYSQLMANAGER.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+	#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////

VC++Files/mysqlmanager/RESOURCE.H

+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by MySqlManager.rc
+//
+#define IDC_START_PB                    3
+#define IDC_STOP_PB                     4
+#define ID_SERVERS_PB                   7
+#define IDD_ABOUTBOX                    100
+#define IDM_QUERY_EXEC                  101
+#define IDM_QUERY_DATABASES             102
+#define IDM_REFRESH                     103
+#define IDD_REGISTER_SERVER             114
+#define IDR_MAINFRAME                   128
+#define IDR_MYSQLMTYPE                  129
+#define IDD_TOOL_SQL                    132
+#define IDB_BITMAP1                     133
+#define IDD_TOOL_SQL_QUERY              134
+#define IDD_TOOL_SQL_RESULTS            135
+#define IDD_TOOL_SQL_STATUS             136
+#define IDC_TAB1                        1000
+#define IDC_EDIT                        1001
+#define IDC_QUERY_PB                    1002
+#define IDC_FONT_PB                     1003
+#define IDS_QUERY_EXEC                  1003
+#define ID_SERVER_CB                    1003
+#define ID_USER                         1004
+#define IDC_SERVER_CB                   1004
+#define IDC_DATABASES_PB                1005
+#define ID_PASSWORD                     1005
+#define ID_HOST_CB                      1006
+#define IDC_TIMER_SECS                  1006
+#define ID_PORT_CB                      1007
+#define IDC_CLEAR                       1007
+#define ID_GROUPS_PB                    1012
+#define ID_REMOVE_PB                    1017
+#define ID_DISPLAY_SERVER_STATUS_CK     1057
+#define ID_USE_STANDARD_CK              1058
+#define ID_USE_TRUSTED_CK               1059
+#define IDM_SQL_TOOL_QUERY              32771
+#define IDM_TOOLS_REGISTER_SERVER       32772
+#define IDM_TOOLS_SERVER_PROPERTIES     32773
+#define IDS_QUERY_DATABASES             57346
+#define IDS_REFRESH                     57347
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_3D_CONTROLS                     1
+#define _APS_NEXT_RESOURCE_VALUE        136
+#define _APS_NEXT_COMMAND_VALUE         32775
+#define _APS_NEXT_CONTROL_VALUE         1008
+#define _APS_NEXT_SYMED_VALUE           104
+#endif
+#endif

VC++Files/mysqlmanager/STDAFX.CPP

+// stdafx.cpp : source file that includes just the standard includes
+//	MySqlManager.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"

VC++Files/mysqlmanager/STDAFX.H

+// stdafx.h : include file for standard system include files,
+//  or project specific include files that are used frequently, but
+//      are changed infrequently
+//
+
+#if !defined(AFX_STDAFX_H__826CB2EC_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_STDAFX_H__826CB2EC_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#include <afxdisp.h>        // MFC OLE automation classes
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>			// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+#include <afxsock.h>
+#include "mysql.h"
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__826CB2EC_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/TOOLSQL.H

+#if !defined(AFX_ToolSql_H__826CB2FC_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_ToolSql_H__826CB2FC_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#include "ToolSqlQuery.h"
+#include "ToolSqlResults.h"
+#include "ToolSqlStatus.h"
+#include "cresource.h"
+#include <my_global.h>
+#include "my_sys.h"
+#include "mysql.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CToolSql dialog
+
+class CToolSql : public CDialog
+{
+// Construction
+public:
+	CToolSql(CWnd* pParent = NULL,CResource* pServer=NULL,CResource* pResource=NULL);
+	~CToolSql();
+
+// Dialog Data
+	//{{AFX_DATA(CToolSql)
+	enum { IDD = IDD_TOOL_SQL };
+	CButton	m_ctl_Stop;
+	CButton	m_ctl_Start;
+	CComboBox	m_ctl_Server;
+	CTabCtrl	m_tabs;
+	int		m_nIntervalTimerSeconds;
+	BOOL	m_bClear;
+	//}}AFX_DATA
+
+	CBitmapButton	m_btn_QueryExec;
+	CBitmapButton	m_btn_Font;
+   CBitmapButton  m_btn_QueryDatabases;
+
+#ifdef _WIN64
+	__int64				m_ui_timer;
+#else
+	UINT				m_ui_timer;
+#endif
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CToolSql)
+	public:
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+   void  ActivateTab ( int tab );
+	void 	DoProcessListQuery();
+
+   CToolSqlQuery*    m_pQuery;
+   CToolSqlResults*  m_pResults;
+   CToolSqlStatus*   m_pStatus;
+
+   CResource*        m_pServer;
+   CResource*        m_pResource;
+   MYSQL*            m_pdb;
+   CFont             m_font;
+   LOGFONT           m_lf;
+   CRect             m_rectTab[2];
+   CRect             m_rectDlg[2];
+
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CToolSql)
+	virtual BOOL OnInitDialog();
+	afx_msg void OnQueryPb();
+	afx_msg void OnQueryDatabases();
+	afx_msg void OnSelchangeTab1(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnFontPb();
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	virtual void OnOK();
+	virtual void OnCancel();
+	afx_msg void OnStartPb();
+	afx_msg void OnStopPb();
+	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnDestroy();
+	afx_msg void OnClear();
+	afx_msg void OnChangeTimerSecs();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+   void DoOnSize(UINT nType, int cx, int cy) ;
+
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_ToolSql_H__826CB2FC_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/cresource.h

+#ifndef _CRESOURCE_H
+#define _CRESOURCE_H
+
+/////////////////////////////////////////////////////////////////////////////
+
+#define MYSQL_PORT_AS_STRING "3306" /* Can't use # in preprocessor because of bugs in VC++ 5.0 */
+
+class CResource
+{
+public:
+   enum eRESOURCETYPE
+   {
+      eNone
+   ,  eServer
+   ,  eDatabase
+   ,  eTable
+   ,  eField
+   ,  eProcesslist
+   ,  eProcesslistItem
+   };
+   virtual LPCTSTR GetDisplayName() { return ""; }
+   virtual LPCTSTR GetHostName() { return LOCAL_HOST; }
+   virtual LPCTSTR GetUserName() { return "root"; }
+   virtual LPCTSTR GetPassword() { return ""; }
+   virtual LPCTSTR GetPortName() { return MYSQL_PORT_AS_STRING; }
+   virtual int     GetPortNumber() { return MYSQL_PORT; }
+   virtual eRESOURCETYPE GetType() { return eNone; }
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+class CResourceServer : public CResource
+{
+public:
+   CResourceServer(LPCTSTR pszName = "",LPCTSTR pszHost = LOCAL_HOST ,LPCTSTR pszUser = "root", LPCTSTR pszPassword = "", LPCTSTR pszPort = MYSQL_PORT_AS_STRING)
+       : m_strName(pszName)
+       , m_strHost(pszHost)
+       , m_strUser(pszUser)
+       , m_strPassword(pszPassword)
+       , m_strPort(pszPort)
+   {
+   }
+   virtual LPCTSTR GetDisplayName() { return m_strName; }
+   virtual LPCTSTR GetHostName() { return m_strHost; }
+   virtual LPCTSTR GetUserName() { return m_strUser; }
+   virtual LPCTSTR GetPassword() { return m_strPassword; }
+   virtual eRESOURCETYPE GetType() { return eServer; }
+   virtual LPCTSTR GetPortName() { return m_strPort; }
+   virtual int     GetPortNumber() { return atoi(m_strPort); }
+   CString     m_strName;
+   CString     m_strHost;
+   CString     m_strUser;
+   CString     m_strPassword;
+   CString     m_strPort;
+   CStringArray   m_rgFields;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+class CResourceDatabase : public CResource
+{
+public:
+   CResourceDatabase(LPCTSTR pszName = "")
+       : m_strName(pszName)
+   {
+   }
+   virtual LPCTSTR GetDisplayName() { return m_strName; }
+   virtual eRESOURCETYPE GetType() { return eDatabase; }
+   CString     m_strName;
+   CStringArray   m_rgFields;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+class CResourceTable : public CResource
+{
+public:
+   CResourceTable(LPCTSTR pszName = "")
+       : m_strName(pszName)
+   {
+   }
+   virtual LPCTSTR GetDisplayName() { return m_strName; }
+   virtual eRESOURCETYPE GetType() { return eTable; }
+   CString     m_strName;
+   CStringArray   m_rgFields;
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+class CResourceField : public CResource
+{
+public:
+   CResourceField(LPCTSTR pszName = "")
+       : m_strName(pszName)
+   {
+   }
+   virtual LPCTSTR GetDisplayName() { return m_strName; }
+   virtual eRESOURCETYPE GetType() { return eField; }
+   CString     m_strName;
+   CStringArray   m_rgFields;
+};
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+class CResourceProcesslist : public CResource
+{
+public:
+   CResourceProcesslist(LPCTSTR pszName = "Processlist")
+       : m_strName(pszName)
+   {
+   }
+   virtual LPCTSTR GetDisplayName() { return m_strName; }
+   virtual eRESOURCETYPE GetType() { return eProcesslist; }
+   CString        m_strName;
+   CStringArray   m_rgFields;
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+class CResourceProcesslistItem : public CResourceProcesslist
+{
+public:
+   CResourceProcesslistItem(LPCTSTR pszName = "ProcesslistItem")
+       : CResourceProcesslist(pszName)
+   {
+   }
+   virtual eRESOURCETYPE GetType() { return eProcesslistItem; }
+};
+
+
+#endif

VC++Files/mysqlmanager/mysqlmanager.cpp

+// MySqlManager.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "MySqlManager.h"
+
+#include "MainFrm.h"
+#include "ChildFrm.h"
+#include "MySqlManagerDoc.h"
+#include "MySqlManagerView.h"
+
+#ifdef _DEBUG
+   #define new DEBUG_NEW
+   #undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerApp
+
+BEGIN_MESSAGE_MAP(CMySqlManagerApp, CWinApp)
+//{{AFX_MSG_MAP(CMySqlManagerApp)
+	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
+// NOTE - the ClassWizard will add and remove mapping macros here.
+//    DO NOT EDIT what you see in these blocks of generated code!
+//}}AFX_MSG_MAP
+// Standard file based document commands
+	ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew)
+	ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen)
+// Standard print setup command
+	ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup)
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerApp construction
+
+CMySqlManagerApp::CMySqlManagerApp()
+{
+   // TODO: add construction code here,
+   // Place all significant initialization in InitInstance
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only CMySqlManagerApp object
+
+CMySqlManagerApp theApp;
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerApp initialization
+
+BOOL CMySqlManagerApp::InitInstance()
+{
+
+   WSADATA WsaData;
+
+   if (SOCKET_ERROR == WSAStartup (0x0101, &WsaData))
+   {
+      AfxMessageBox("WSAStartup Failed\n");
+      return FALSE;
+   }
+
+   AfxEnableControlContainer();
+
+   // Standard initialization
+   // If you are not using these features and wish to reduce the size
+   //  of your final executable, you should remove from the following
+   //  the specific initialization routines you do not need.
+
+#ifdef _AFXDLL
+   Enable3dControls();        // Call this when using MFC in a shared DLL
+#else
+   Enable3dControlsStatic();  // Call this when linking to MFC statically
+#endif
+
+   // Change the registry key under which our settings are stored.
+   // You should modify this string to be something appropriate
+   // such as the name of your company or organization.
+   SetRegistryKey(_T("Local AppWizard-Generated Applications"));
+
+   LoadStdProfileSettings();  // Load standard INI file options (including MRU)
+
+   // Register the application's document templates.  Document templates
+   //  serve as the connection between documents, frame windows and views.
+
+   CMultiDocTemplate* pDocTemplate;
+   pDocTemplate = new CMultiDocTemplate(
+                                       IDR_MYSQLMTYPE,
+                                       RUNTIME_CLASS(CMySqlManagerDoc),
+                                       RUNTIME_CLASS(CChildFrame), // custom MDI child frame
+                                       RUNTIME_CLASS(CMySqlManagerView));
+   AddDocTemplate(pDocTemplate);
+
+   // create main MDI Frame window
+   CMainFrame* pMainFrame = new CMainFrame;
+   if (!pMainFrame->LoadFrame(IDR_MAINFRAME))
+      return FALSE;
+   m_pMainWnd = pMainFrame;
+
+   // Parse command line for standard shell commands, DDE, file open
+   CCommandLineInfo cmdInfo;
+   ParseCommandLine(cmdInfo);
+
+   // Dispatch commands specified on the command line
+   if (!ProcessShellCommand(cmdInfo))
+      return FALSE;
+
+   // The main window has been initialized, so show and update it.
+   pMainFrame->ShowWindow(m_nCmdShow);
+   pMainFrame->UpdateWindow();
+
+   return TRUE;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CAboutDlg dialog used for App About
+
+class CAboutDlg : public CDialog
+{
+public:
+   CAboutDlg();
+
+// Dialog Data
+   //{{AFX_DATA(CAboutDlg)
+   enum {IDD = IDD_ABOUTBOX};
+   //}}AFX_DATA
+
+   // ClassWizard generated virtual function overrides
+   //{{AFX_VIRTUAL(CAboutDlg)
+protected:
+   virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+   //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+   //{{AFX_MSG(CAboutDlg)
+   // No message handlers
+   //}}AFX_MSG
+   DECLARE_MESSAGE_MAP()
+};
+
+CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
+{
+   //{{AFX_DATA_INIT(CAboutDlg)
+   //}}AFX_DATA_INIT
+}
+
+void CAboutDlg::DoDataExchange(CDataExchange* pDX)
+{
+   CDialog::DoDataExchange(pDX);
+   //{{AFX_DATA_MAP(CAboutDlg)
+   //}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
+//{{AFX_MSG_MAP(CAboutDlg)
+// No message handlers
+//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+// App command to run the dialog
+void CMySqlManagerApp::OnAppAbout()
+{
+   CAboutDlg aboutDlg;
+   aboutDlg.DoModal();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerApp commands

VC++Files/mysqlmanager/mysqlmanager.h

+// MySqlManager.h : main header file for the MYSQLMANAGER application
+//
+
+#if !defined(AFX_MYSQLMANAGER_H__826CB2EA_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_MYSQLMANAGER_H__826CB2EA_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#ifndef __AFXWIN_H__
+	#error include 'stdafx.h' before including this file for PCH
+#endif
+
+#include "resource.h"       // main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerApp:
+// See MySqlManager.cpp for the implementation of this class
+//
+
+class CMySqlManagerApp : public CWinApp
+{
+public:
+	CMySqlManagerApp();
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CMySqlManagerApp)
+	public:
+	virtual BOOL InitInstance();
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+	//{{AFX_MSG(CMySqlManagerApp)
+	afx_msg void OnAppAbout();
+		// NOTE - the ClassWizard will add and remove member functions here.
+		//    DO NOT EDIT what you see in these blocks of generated code !
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_MYSQLMANAGER_H__826CB2EA_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/mysqlmanagerdoc.cpp

+// MySqlManagerDoc.cpp : implementation of the CMySqlManagerDoc class
+//
+
+#include "stdafx.h"
+#include "MySqlManager.h"
+
+#include "MySqlManagerDoc.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerDoc
+
+IMPLEMENT_DYNCREATE(CMySqlManagerDoc, CDocument)
+
+BEGIN_MESSAGE_MAP(CMySqlManagerDoc, CDocument)
+	//{{AFX_MSG_MAP(CMySqlManagerDoc)
+		// NOTE - the ClassWizard will add and remove mapping macros here.
+		//    DO NOT EDIT what you see in these blocks of generated code!
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerDoc construction/destruction
+
+CMySqlManagerDoc::CMySqlManagerDoc()
+{
+	// TODO: add one-time construction code here
+
+}
+
+CMySqlManagerDoc::~CMySqlManagerDoc()
+{
+}
+
+BOOL CMySqlManagerDoc::OnNewDocument()
+{
+	if (!CDocument::OnNewDocument())
+		return FALSE;
+
+	// TODO: add reinitialization code here
+	// (SDI documents will reuse this document)
+
+	return TRUE;
+}
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerDoc serialization
+
+void CMySqlManagerDoc::Serialize(CArchive& ar)
+{
+	if (ar.IsStoring())
+	{
+		// TODO: add storing code here
+	}
+	else
+	{
+		// TODO: add loading code here
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerDoc diagnostics
+
+#ifdef _DEBUG
+void CMySqlManagerDoc::AssertValid() const
+{
+	CDocument::AssertValid();
+}
+
+void CMySqlManagerDoc::Dump(CDumpContext& dc) const
+{
+	CDocument::Dump(dc);
+}
+#endif //_DEBUG
+
+/////////////////////////////////////////////////////////////////////////////
+// CMySqlManagerDoc commands

VC++Files/mysqlmanager/mysqlmanagerdoc.h

+// MySqlManagerDoc.h : interface of the CMySqlManagerDoc class
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_MYSQLMANAGERDOC_H__826CB2F2_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_MYSQLMANAGERDOC_H__826CB2F2_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+
+class CMySqlManagerDoc : public CDocument
+{
+protected: // create from serialization only
+	CMySqlManagerDoc();
+	DECLARE_DYNCREATE(CMySqlManagerDoc)
+
+// Attributes
+public:
+
+// Operations
+public:
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CMySqlManagerDoc)
+	public:
+	virtual BOOL OnNewDocument();
+	virtual void Serialize(CArchive& ar);
+	//}}AFX_VIRTUAL
+
+// Implementation
+public:
+	virtual ~CMySqlManagerDoc();
+#ifdef _DEBUG
+	virtual void AssertValid() const;
+	virtual void Dump(CDumpContext& dc) const;
+#endif
+
+protected:
+
+// Generated message map functions
+protected:
+	//{{AFX_MSG(CMySqlManagerDoc)
+		// NOTE - the ClassWizard will add and remove member functions here.
+		//    DO NOT EDIT what you see in these blocks of generated code !
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_MYSQLMANAGERDOC_H__826CB2F2_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/mysqlmanagerview.h

+// MySqlManagerView.h : interface of the CMySqlManagerView class
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_MYSQLMANAGERVIEW_H__826CB2F4_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_MYSQLMANAGERVIEW_H__826CB2F4_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#include <afxcview.h>
+#include "cresource.h"
+
+class CToolSql;
+
+class CMySqlManagerView : public CTreeView
+{
+protected: // create from serialization only
+	CMySqlManagerView();
+	DECLARE_DYNCREATE(CMySqlManagerView)
+
+// Attributes
+public:
+	CMySqlManagerDoc* GetDocument();
+
+// Operations
+public:
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CMySqlManagerView)
+	public:
+	virtual void OnDraw(CDC* pDC);  // overridden to draw this view
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	virtual void OnInitialUpdate();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	protected:
+	virtual BOOL OnPreparePrinting(CPrintInfo* pInfo);
+	virtual void OnBeginPrinting(CDC* pDC, CPrintInfo* pInfo);
+	virtual void OnEndPrinting(CDC* pDC, CPrintInfo* pInfo);
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+   CResource*        GetSelectedResource(HTREEITEM* phItemRet=NULL);
+   CResourceServer*  GetServerResource(HTREEITEM hItem);
+
+   HTREEITEM   AddResource ( HTREEITEM hParent, CResource* pRes, HTREEITEM hLastItem = TVI_FIRST ) ;
+   void        ProcessResultSet ( HTREEITEM hItem, LPVOID result, CResource* pResource );
+
+public:
+	virtual ~CMySqlManagerView();
+#ifdef _DEBUG
+	virtual void AssertValid() const;
+	virtual void Dump(CDumpContext& dc) const;
+#endif
+
+protected:
+
+	CTreeCtrl*	   m_pTree;
+	CImageList*	   m_pImages;
+	CBitmap*	      m_pbmBmp;
+	CToolSql*      m_pTool;
+
+// Generated message map functions
+protected:
+	//{{AFX_MSG(CMySqlManagerView)
+	afx_msg void OnDblclk(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnSqlToolQuery();
+	afx_msg void OnRefresh();
+	afx_msg void OnRegisterServer();
+   afx_msg void OnServerProperties();
+	afx_msg void OnRclick(NMHDR* pNMHDR, LRESULT* pResult);
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+#ifndef _DEBUG  // debug version in MySqlManagerView.cpp
+inline CMySqlManagerDoc* CMySqlManagerView::GetDocument()
+   { return (CMySqlManagerDoc*)m_pDocument; }
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_MYSQLMANAGERVIEW_H__826CB2F4_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/registerserver.cpp

+// RegisterServer.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "mysqlmanager.h"
+#include "RegisterServer.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CRegisterServer dialog
+
+
+CRegisterServer::CRegisterServer(CWnd* pParent /*=NULL*/)
+	: CDialog(CRegisterServer::IDD, pParent)
+	, m_strServer("servername")
+	, m_strHost("localhost")
+	, m_strUser("root")
+	, m_strPassword("")
+{
+	//{{AFX_DATA_INIT(CRegisterServer)
+	m_strPort = _T("3306");
+	//}}AFX_DATA_INIT
+}
+
+
+void CRegisterServer::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CRegisterServer)
+	DDX_CBString(pDX, ID_SERVER_CB, m_strServer);
+	DDX_CBString(pDX, ID_HOST_CB, m_strHost);
+	DDX_Text(pDX, ID_USER, m_strUser);
+	DDX_Text(pDX, ID_PASSWORD, m_strPassword);
+	DDX_CBString(pDX, ID_PORT_CB, m_strPort);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CRegisterServer, CDialog)
+	//{{AFX_MSG_MAP(CRegisterServer)
+		// NOTE: the ClassWizard will add message map macros here
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CRegisterServer message handlers

VC++Files/mysqlmanager/registerserver.h

+#if !defined(AFX_REGISTERSERVER_H__826CB2FF_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_REGISTERSERVER_H__826CB2FF_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// RegisterServer.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CRegisterServer dialog
+
+class CRegisterServer : public CDialog
+{
+// Construction
+public:
+	CRegisterServer(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CRegisterServer)
+	enum { IDD = IDD_REGISTER_SERVER };
+	CString	m_strServer;
+	CString	m_strHost;
+	CString	m_strUser;
+	CString	m_strPassword;
+	CString	m_strPort;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CRegisterServer)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CRegisterServer)
+		// NOTE: the ClassWizard will add member functions here
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_REGISTERSERVER_H__826CB2FF_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/toolsqlquery.cpp

+// ToolSqlQuery.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "MySqlManager.h"
+#include "ToolSqlQuery.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+
+CToolSqlQuery::CToolSqlQuery(CWnd* pParent /*=NULL*/)
+	: CDialog(CToolSqlQuery::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(CToolSqlQuery)
+	m_edit = _T("");
+	//}}AFX_DATA_INIT
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlQuery::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CToolSqlQuery)
+	DDX_Control(pDX, IDC_EDIT, m_ctl_edit);
+	DDX_Text(pDX, IDC_EDIT, m_edit);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CToolSqlQuery, CDialog)
+	//{{AFX_MSG_MAP(CToolSqlQuery)
+	ON_WM_SIZE()
+	ON_WM_CLOSE()
+	ON_COMMAND(IDM_QUERY_EXEC, OnQueryPb)
+	ON_COMMAND(IDM_QUERY_DATABASES, OnQueryDatabases)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlQuery::SetFont(CFont* pFont, BOOL bRedraw)
+{
+	m_ctl_edit.SetFont(pFont,bRedraw);
+	m_ctl_edit.Invalidate();
+	m_ctl_edit.UpdateWindow();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlQuery::OnSize(UINT nType, int cx, int cy)
+{
+	CDialog::OnSize(nType, cx, cy);
+   if (IsWindow(m_ctl_edit.GetSafeHwnd()))
+	   m_ctl_edit.SetWindowPos(NULL,20,24,cx-40,cy-48,SWP_NOZORDER | SWP_NOMOVE);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlQuery::OnCancel()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlQuery::OnClose()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlQuery::OnQueryPb()
+{
+   GetParent()->GetParent()->PostMessage(WM_COMMAND,IDM_QUERY_EXEC);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlQuery::OnQueryDatabases()
+{
+   GetParent()->GetParent()->PostMessage(WM_COMMAND,IDM_QUERY_DATABASES);
+}
+/////////////////////////////////////////////////////////////////////////////
+
+BOOL CToolSqlQuery::PreTranslateMessage(MSG* pMsg)
+{
+   if (pMsg->message >= WM_KEYFIRST && pMsg->message <= WM_KEYLAST)
+   {
+      if (::TranslateAccelerator(m_hWnd, m_hAccel, pMsg))
+         return TRUE;
+   }
+	return CDialog::PreTranslateMessage(pMsg);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+BOOL CToolSqlQuery::OnInitDialog()
+{
+
+   CDialog::OnInitDialog();
+   m_hAccel = ::LoadAccelerators(AfxGetInstanceHandle(), MAKEINTRESOURCE ( IDR_MAINFRAME ));
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}

VC++Files/mysqlmanager/toolsqlquery.h

+#if !defined(AFX_TOOLSQLQUERY_H__826CB2FD_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_TOOLSQLQUERY_H__826CB2FD_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// ToolSqlQuery.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CToolSqlQuery dialog
+
+class CToolSqlQuery : public CDialog
+{
+// Construction
+public:
+	CToolSqlQuery(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CToolSqlQuery)
+	enum { IDD = IDD_TOOL_SQL_QUERY };
+	CEdit	m_ctl_edit;
+	CString	m_edit;
+	//}}AFX_DATA
+
+   HACCEL            m_hAccel;
+
+	void SetFont(CFont* pFont, BOOL bRedraw = TRUE);
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CToolSqlQuery)
+	public:
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CToolSqlQuery)
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnCancel();
+	afx_msg void OnClose();
+	virtual BOOL OnInitDialog();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+	afx_msg void OnQueryPb();
+	afx_msg void OnQueryDatabases();
+
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_TOOLSQLQUERY_H__826CB2FD_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/toolsqlresults.cpp

+// ToolSqlResults.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "MySqlManager.h"
+#include "ToolSqlResults.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+
+CToolSqlResults::CToolSqlResults(CWnd* pParent /*=NULL*/)
+	: CDialog(CToolSqlResults::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(CToolSqlResults)
+	m_edit = _T("");
+	//}}AFX_DATA_INIT
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlResults::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CToolSqlResults)
+	DDX_Control(pDX, IDC_EDIT, m_ctl_edit);
+	DDX_Text(pDX, IDC_EDIT, m_edit);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CToolSqlResults, CDialog)
+	//{{AFX_MSG_MAP(CToolSqlResults)
+	ON_WM_SIZE()
+	ON_WM_CLOSE()
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlResults::SetFont(CFont* pFont, BOOL bRedraw)
+{
+	m_ctl_edit.SetFont(pFont,bRedraw);
+	m_ctl_edit.Invalidate();
+	m_ctl_edit.UpdateWindow();
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlResults::OnSize(UINT nType, int cx, int cy)
+{
+	CDialog::OnSize(nType, cx, cy);
+   if (IsWindow(m_ctl_edit.GetSafeHwnd()))
+	   m_ctl_edit.SetWindowPos(NULL,20,24,cx-40,cy-48,SWP_NOZORDER | SWP_NOMOVE);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlResults::OnCancel()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void CToolSqlResults::OnClose()
+{
+}

VC++Files/mysqlmanager/toolsqlresults.h

+#if !defined(AFX_TOOLSQLRESULTS_H__826CB2FE_8B6D_11D1_AEC1_00600806E071__INCLUDED_)
+#define AFX_TOOLSQLRESULTS_H__826CB2FE_8B6D_11D1_AEC1_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// ToolSqlResults.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CToolSqlResults dialog
+
+class CToolSqlResults : public CDialog
+{
+// Construction
+public:
+	CToolSqlResults(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CToolSqlResults)
+	enum { IDD = IDD_TOOL_SQL_RESULTS };
+	CEdit	m_ctl_edit;
+	CString	m_edit;
+	//}}AFX_DATA
+
+	void SetFont(CFont* pFont, BOOL bRedraw = TRUE);
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CToolSqlResults)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CToolSqlResults)
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnCancel();
+	afx_msg void OnClose();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+
+
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_TOOLSQLRESULTS_H__826CB2FE_8B6D_11D1_AEC1_00600806E071__INCLUDED_)

VC++Files/mysqlmanager/toolsqlstatus.cpp

+// ToolSqlStatus.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "mysqlmanager.h"
+#include "ToolSqlStatus.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CToolSqlStatus dialog
+
+
+CToolSqlStatus::CToolSqlStatus(CWnd* pParent /*=NULL*/)
+	: CDialog(CToolSqlStatus::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(CToolSqlStatus)
+	m_edit = _T("");
+	//}}AFX_DATA_INIT
+}
+
+
+void CToolSqlStatus::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CToolSqlStatus)
+	DDX_Control(pDX, IDC_EDIT, m_ctl_edit);
+	DDX_Text(pDX, IDC_EDIT, m_edit);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CToolSqlStatus, CDialog)
+	//{{AFX_MSG_MAP(CToolSqlStatus)
+	ON_WM_DESTROY()
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CToolSqlStatus message handlers
+
+void CToolSqlStatus::OnDestroy()
+{
+	CDialog::OnDestroy();
+
+}

VC++Files/mysqlmanager/toolsqlstatus.h

+#if !defined(AFX_TOOLSQLSTATUS_H__40C861B4_9E5A_11D1_AED0_00600806E071__INCLUDED_)
+#define AFX_TOOLSQLSTATUS_H__40C861B4_9E5A_11D1_AED0_00600806E071__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+// ToolSqlStatus.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
+// CToolSqlStatus dialog
+
+class CToolSqlStatus : public CDialog
+{
+// Construction
+public:
+	CToolSqlStatus(CWnd* pParent = NULL);   // standard constructor
+
+// Dialog Data
+	//{{AFX_DATA(CToolSqlStatus)
+	enum { IDD = IDD_TOOL_SQL_STATUS };
+	CEdit	m_ctl_edit;
+	CString	m_edit;
+	//}}AFX_DATA
+
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CToolSqlStatus)
+	protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+	// Generated message map functions
+	//{{AFX_MSG(CToolSqlStatus)
+	afx_msg void OnDestroy();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_TOOLSQLSTATUS_H__40C861B4_9E5A_11D1_AED0_00600806E071__INCLUDED_)

VC++Files/mysqlshutdown/mysqlshutdown.rc

+MySql ICON    DISCARDABLE     "MYSQL.ICO"
+

VC++Files/mysys/mysys.dsp

@@ -26,7 +26,7 @@ CFG=mysys - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "mysys - Win32 Release"
@@ -42,14 +42,14 @@ RSC=rc.exe
 # 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 "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /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
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_release\mysys.lib"
 
@@ -66,14 +66,14 @@ LIB32=xilink6.exe -lib
 # 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 /ZI /Od /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /ZI /Od /I "../include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
 # SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\mysys.lib"
 
@@ -86,8 +86,8 @@ LIB32=xilink6.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "max"
-# PROP Intermediate_Dir "max"
+# PROP Output_Dir "mysys___Win32_Max"
+# PROP Intermediate_Dir "mysys___Win32_Max"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c
 # SUBTRACT BASE CPP /YX
@@ -98,7 +98,7 @@ LIB32=xilink6.exe -lib
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
+LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib_release\mysys.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\mysys-max.lib"
 
@@ -283,19 +283,6 @@ SOURCE=.\my_clock.c
 # Begin Source File
 
 SOURCE=.\my_compress.c
-
-!IF  "$(CFG)" == "mysys - Win32 Release"
-
-# ADD CPP /I "../zlib"
-
-!ELSEIF  "$(CFG)" == "mysys - Win32 Debug"
-
-# ADD CPP /I "../zlib"
-
-!ELSEIF  "$(CFG)" == "mysys - Win32 Max"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File
 

VC++Files/prepare

+#!/bin/sh
+
+if [ -f prepare_done ]
+then
+    exit
+fi
+
+cd ..
+SRCDIR=`pwd`
+
+(
+find $SRCDIR -name *.dsw -and -not -path \*SCCS\* -print
+find $SRCDIR -name *.dsp -and -not -path \*SCCS\* -print
+)|(
+while read v 
+do
+    sed 's/$'"/`echo -e \\\r`/" $v > $v.tmp
+    rm $v
+    mv $v.tmp $v
+done
+)
+
+ln -s $SRCDIR/include $SRCDIR/VC++Files/include
+
+link_dir_files()
+{
+    for arg do
+
+    cd $SRCDIR/$arg/
+    (
+     ls -A1|grep \\.[ch]$
+     ls -A1|grep \\.ih$
+     ls -A1|grep \\.asm$
+    )|(
+    while read v 
+    do
+	ln -s $SRCDIR/$arg/$v $SRCDIR/VC++Files/$arg/$v
+    done
+    )
+
+    cd $SRCDIR/$arg/
+    (ls -A1|grep \\.cc$|sed 's/.cc$//g')|(
+    while read v 
+    do
+	ln -s $SRCDIR/$arg/$v.cc $SRCDIR/VC++Files/$arg/$v.cpp
+    done
+    )
+    
+    done
+}
+
+link_dir_dirs()
+{
+    for arg do
+    
+    cd $SRCDIR/$arg/
+    (
+      ls -l |grep "^d"|awk '{print($9)}' -
+    )|(
+    while read v 
+    do
+	ln -s $SRCDIR/$arg/$v $SRCDIR/VC++Files/$arg/
+    done
+    )
+    
+    done
+}
+
+link_dir_files 'heap'
+link_dir_files 'isam'
+link_dir_files 'merge'
+link_dir_files 'mysys'
+link_dir_files 'zlib'
+link_dir_files 'regex'
+link_dir_files 'strings'
+link_dir_files 'dbug'
+link_dir_files 'vio'
+link_dir_files 'client'
+link_dir_files 'libmysql'
+link_dir_files 'extra'
+link_dir_files 'myisam'
+link_dir_files 'myisammrg'
+link_dir_files 'innobase'
+link_dir_files 'bdb'
+link_dir_files 'sql'
+link_dir_files 'bdb/build_win32'
+link_dir_files 'libmysqld'
+
+link_dir_dirs 'bdb'
+link_dir_dirs 'innobase'
+
+ln -s $SRCDIR/myisam/myisampack.c $SRCDIR/VC++Files/myisampack/
+ln -s $SRCDIR/client/mysqlbinlog.cc $SRCDIR/VC++Files/mysqlbinlog/mysqlbinlog.cpp
+ln -s $SRCDIR/isam/pack_isam.c $SRCDIR/VC++Files/pack_isam/pack_isam.c
+
+echo '/* added for win : */' >> $SRCDIR/config.h
+echo '#undef HAVE_SCHED_H' >> $SRCDIR/config.h
+echo '#USE_QUERY_CACHE_INTEGRITY_CHECK 1' >> $SRCDIR/config.h
+
+echo '/* added for win : */' >> $SRCDIR/innobase/ib_config.h
+echo '#undef HAVE_SCHED_H' >> $SRCDIR/innobase/ib_config.h
+
+cd $SRCDIR/VC++Files
+echo '1' > prepare_done
\ No newline at end of file

client/mysql.cc

@@ -40,7 +40,7 @@
 #include <signal.h>
 #include <violite.h>
 
-const char *VER= "12.14";
+const char *VER= "12.15";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -556,8 +556,9 @@ static struct my_option my_long_options[] =
   {"safe-updates", 'U', "Only allow UPDATE and DELETE that uses keys.",
    (gptr*) &safe_updates, (gptr*) &safe_updates, 0, GET_BOOL, OPT_ARG, 0, 0,
    0, 0, 0, 0},
-  {"i-am-a-dummy", 'U', "Synonym for option --safe-updates, -U.", 0, 0, 0,
-   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"i-am-a-dummy", 'U', "Synonym for option --safe-updates, -U.",
+   (gptr*) &safe_updates, (gptr*) &safe_updates, 0, GET_BOOL, OPT_ARG, 0, 0,
+   0, 0, 0, 0},
   {"verbose", 'v', "Write more. (-v -v -v gives the table output format)", 0,
    0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"version", 'V', "Output version information and exit.", 0, 0, 0,

myisam/myisampack.c

@@ -269,7 +269,7 @@ static struct my_option my_long_options[] =
 
 static void print_version(void)
 {
-  printf("%s Ver 1.21 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
+  printf("%s Ver 1.22 for %s on %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE);
 }
 
 static void usage(void)
@@ -282,7 +282,7 @@ static void usage(void)
   puts("Pack a MyISAM-table to take much less space.");
   puts("Keys are not updated, you must run myisamchk -rq on the datafile");
   puts("afterwards to update the keys.");
-  puts("You should give the .MSI file as the filename argument.");
+  puts("You should give the .MYI file as the filename argument.");
 
   printf("\nUsage: %s [OPTIONS] filename...\n", my_progname);
   my_print_help(my_long_options);

mysql-test/Makefile.am

@@ -42,6 +42,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t
 	$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r
+	$(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r
 	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include
 	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data
 

mysql-test/r/query_cache.result

@@ -526,3 +526,13 @@ show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	2
 drop table t1, t2, t3;
+use mysql;
+select * from db;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	0
+use test;
+select * from mysql.db;
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	0

mysql-test/t/query_cache.test

@@ -367,3 +367,17 @@ show status like "Qcache_queries_in_cache";
 select * from t3;
 show status like "Qcache_queries_in_cache";
 drop table t1, t2, t3;
+
+#
+# system databse test
+#
+use mysql;
+disable_result_log;
+select * from db;
+enable_result_log;
+show status like "Qcache_queries_in_cache";
+use test;
+disable_result_log;
+select * from mysql.db;
+enable_result_log;
+show status like "Qcache_queries_in_cache";

scripts/mysqld_safe.sh

@@ -307,8 +307,8 @@ do
     done
   fi
 
-  echo "`date +'%y%m%d %H:%M:%S  mysqld restarted'`" | tee -a $err_log
+  echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
 done
 
-echo "`date +'%y%m%d %H:%M:%S  mysqld ended'`" | tee -a $err_log
+echo "`date +'%y%m%d %H:%M:%S'`  mysqld ended" | tee -a $err_log
 echo "" | tee -a $err_log

sql/sql_cache.cc

@@ -342,6 +342,12 @@ TODO list:
 #define DUMP(C)
 #endif
 
+#ifdef FN_NO_CASE_SENCE
+#define DB_NAME_PREPROCESS(C) tolower(C)
+#else
+#define DB_NAME_PREPROCESS(C) (C)
+#endif
+
 const char *query_cache_type_names[]= { "OFF", "ON", "DEMAND",NullS };
 TYPELIB query_cache_type_typelib=
 {
@@ -1378,11 +1384,11 @@ ulong Query_cache::init_cache()
 
   VOID(hash_init(&queries,def_query_hash_size, 0, 0,
 		 query_cache_query_get_key, 0, 0));
-#ifndef __WIN__
+#ifndef FN_NO_CASE_SENCE
   VOID(hash_init(&tables,def_table_hash_size, 0, 0,
 		 query_cache_table_get_key, 0, 0));
 #else
-  // windows case insensitive file names work around
+  // windows, OS/2 or other case insensitive file names work around
   VOID(hash_init(&tables,def_table_hash_size, 0, 0,
 		 query_cache_table_get_key, 0,
 		 (lower_case_table_names?0:HASH_CASE_INSENSITIVE)));  
@@ -2432,7 +2438,7 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len,
 			lex->select->options,
 			(int) thd->variables.query_cache_type));
 
-    for (; tables_used; tables_used=tables_used->next)
+    for (; tables_used; tables_used= tables_used->next)
     {
       tables++;
       DBUG_PRINT("qcache", ("table %s, db %s, type %u",
@@ -2442,10 +2448,16 @@ TABLE_COUNTER_TYPE Query_cache::is_cacheable(THD *thd, uint32 query_len,
 			  tables_used->table->file->has_transactions());
 
       if (tables_used->table->db_type == DB_TYPE_MRG_ISAM ||
-	  tables_used->table->tmp_table != NO_TMP_TABLE)
+	  tables_used->table->tmp_table != NO_TMP_TABLE ||
+	  (tables_used->db_length == 5 && 
+	   DB_NAME_PREPROCESS(tables_used->db[0])=='m' &&
+	   DB_NAME_PREPROCESS(tables_used->db[1])=='y' &&
+	   DB_NAME_PREPROCESS(tables_used->db[2])=='s' &&
+	   DB_NAME_PREPROCESS(tables_used->db[3])=='q' &&
+	   DB_NAME_PREPROCESS(tables_used->db[4])=='l'))
       {
 	DBUG_PRINT("qcache", 
-		   ("select not cacheable: used MRG_ISAM or temporary table(s)"));
+		   ("select not cacheable: used MRG_ISAM, temporary or system table(s)"));
 	DBUG_RETURN(0);
       }
       if (tables_used->table->db_type == DB_TYPE_MRG_MYISAM)