Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO

Conflicts:
	storage/innobase/os/os0file.cc
	storage/xtradb/os/os0file.cc
	storage/xtradb/srv/srv0start.cc

1 files changed, 57 insertions, 57 deletions

diff --git a/win/upgrade_wizard/upgrade.cpp b/win/upgrade_wizard/upgrade.cpp
index aa9efa15ecc..ea2f894c73e 100644
--- a/win/upgrade_wizard/upgrade.cpp
+++ b/win/upgrade_wizard/upgrade.cpp
@@ -1,57 +1,57 @@
-

-// upgrade.cpp : Defines the class behaviors for the application.

-//

-

-#include "stdafx.h"

-#include "upgrade.h"

-#include "upgradeDlg.h"

-

-#ifdef _DEBUG

-#define new DEBUG_NEW

-#endif

-

-

-// CUpgradeApp

-

-BEGIN_MESSAGE_MAP(CUpgradeApp, CWinApp)

-  ON_COMMAND(ID_HELP, &CWinApp::OnHelp)

-END_MESSAGE_MAP()

-

-

-// CUpgradeApp construction

-

-CUpgradeApp::CUpgradeApp()

-{

-  // TODO: add construction code here,

-  // Place all significant initialization in InitInstance

-}

-

-

-// The one and only CUpgradeApp object

-

-CUpgradeApp theApp;

-

-

-// CUpgradeApp initialization

-

-BOOL CUpgradeApp::InitInstance()

-{

-  // InitCommonControlsEx() is required on Windows XP if an application

-  // manifest specifies use of ComCtl32.dll version 6 or later to enable

-  // visual styles.  Otherwise, any window creation will fail.

-  INITCOMMONCONTROLSEX InitCtrls;

-  InitCtrls.dwSize = sizeof(InitCtrls);

-  // Set this to include all the common control classes you want to use

-  // in your application.

-  InitCtrls.dwICC = ICC_WIN95_CLASSES;

-

-  InitCommonControlsEx(&InitCtrls);

-  CWinApp::InitInstance();

-  CUpgradeDlg dlg;

-  m_pMainWnd = &dlg;

-  dlg.DoModal();

-  // Since the dialog has been closed, return FALSE so that we exit the

-  //  application, rather than start the application's message pump.

-  return FALSE;

-}

-

+
+// upgrade.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "upgrade.h"
+#include "upgradeDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+
+// CUpgradeApp
+
+BEGIN_MESSAGE_MAP(CUpgradeApp, CWinApp)
+  ON_COMMAND(ID_HELP, &CWinApp::OnHelp)
+END_MESSAGE_MAP()
+
+
+// CUpgradeApp construction
+
+CUpgradeApp::CUpgradeApp()
+{
+  // TODO: add construction code here,
+  // Place all significant initialization in InitInstance
+}
+
+
+// The one and only CUpgradeApp object
+
+CUpgradeApp theApp;
+
+
+// CUpgradeApp initialization
+
+BOOL CUpgradeApp::InitInstance()
+{
+  // InitCommonControlsEx() is required on Windows XP if an application
+  // manifest specifies use of ComCtl32.dll version 6 or later to enable
+  // visual styles.  Otherwise, any window creation will fail.
+  INITCOMMONCONTROLSEX InitCtrls;
+  InitCtrls.dwSize = sizeof(InitCtrls);
+  // Set this to include all the common control classes you want to use
+  // in your application.
+  InitCtrls.dwICC = ICC_WIN95_CLASSES;
+
+  InitCommonControlsEx(&InitCtrls);
+  CWinApp::InitInstance();
+  CUpgradeDlg dlg;
+  m_pMainWnd = &dlg;
+  dlg.DoModal();
+  // Since the dialog has been closed, return FALSE so that we exit the
+  //  application, rather than start the application's message pump.
+  return FALSE;
+}
+