CRLF->LF

4 files changed, 121 insertions, 121 deletions

diff --git a/sql/message.h b/sql/message.h
index dac0576d0c4..6641453a965 100644
--- a/sql/message.h
+++ b/sql/message.h
@@ -1,77 +1,77 @@
-#ifndef MESSAGE_INCLUDED

-#define MESSAGE_INCLUDED

-/* Copyright (c) 2008, 2009 Sun Microsystems, Inc.

-   Use is subject to license terms.

-

-   This program is free software; you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; version 2 of the License.

-

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-

-   You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software

-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */

-

-/*

-  To change or add messages mysqld writes to the Windows error log, run

-   mc.exe message.mc

-  and checkin generated messages.h, messages.rc and msg000001.bin under the 

-  source control.

-  mc.exe can be installed with Windows SDK, some Visual Studio distributions 

-  do not include it.

-*/

-

-

-//

-//  Values are 32 bit values layed out as follows:

-//

-//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1

-//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

-//  +---+-+-+-----------------------+-------------------------------+

-//  |Sev|C|R|     Facility          |               Code            |

-//  +---+-+-+-----------------------+-------------------------------+

-//

-//  where

-//

-//      Sev - is the severity code

-//

-//          00 - Success

-//          01 - Informational

-//          10 - Warning

-//          11 - Error

-//

-//      C - is the Customer code flag

-//

-//      R - is a reserved bit

-//

-//      Facility - is the facility code

-//

-//      Code - is the facility's status code

-//

-//

-// Define the facility codes

-//

-

-

-//

-// Define the severity codes

-//

-

-

-//

-// MessageId: MSG_DEFAULT

-//

-// MessageText:

-//

-//  %1For more information, see Help and Support Center at http://www.mysql.com.

-//  

-//  

-//

-#define MSG_DEFAULT                      0xC0000064L

-

-#endif /* MESSAGE_INCLUDED */

-

+#ifndef MESSAGE_INCLUDED
+#define MESSAGE_INCLUDED
+/* Copyright (c) 2008, 2009 Sun Microsystems, Inc.
+   Use is subject to license terms.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/*
+  To change or add messages mysqld writes to the Windows error log, run
+   mc.exe message.mc
+  and checkin generated messages.h, messages.rc and msg000001.bin under the 
+  source control.
+  mc.exe can be installed with Windows SDK, some Visual Studio distributions 
+  do not include it.
+*/
+
+
+//
+//  Values are 32 bit values layed out as follows:
+//
+//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+//  +---+-+-+-----------------------+-------------------------------+
+//  |Sev|C|R|     Facility          |               Code            |
+//  +---+-+-+-----------------------+-------------------------------+
+//
+//  where
+//
+//      Sev - is the severity code
+//
+//          00 - Success
+//          01 - Informational
+//          10 - Warning
+//          11 - Error
+//
+//      C - is the Customer code flag
+//
+//      R - is a reserved bit
+//
+//      Facility - is the facility code
+//
+//      Code - is the facility's status code
+//
+//
+// Define the facility codes
+//
+
+
+//
+// Define the severity codes
+//
+
+
+//
+// MessageId: MSG_DEFAULT
+//
+// MessageText:
+//
+//  %1For more information, see Help and Support Center at http://www.mysql.com.
+//  
+//  
+//
+#define MSG_DEFAULT                      0xC0000064L
+
+#endif /* MESSAGE_INCLUDED */
+
diff --git a/sql/message.rc b/sql/message.rc
index 116522b7d48..0885a897e6f 100644
--- a/sql/message.rc
+++ b/sql/message.rc
@@ -1,2 +1,2 @@
-LANGUAGE 0x9,0x1

-1 11 MSG00001.bin

+LANGUAGE 0x9,0x1
+1 11 MSG00001.bin
diff --git a/sql/slave.cc b/sql/slave.cc
index a03deb1e793..2fe7ebb575d 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -4738,8 +4738,8 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi,
   mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
 
   /* Set MYSQL_PLUGIN_DIR in case master asks for an external authentication plugin */
-  if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)

-    mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);

+  if (opt_plugin_dir_ptr && *opt_plugin_dir_ptr)
+    mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir_ptr);
 
   /* we disallow empty users */
   if (mi->user == NULL || mi->user[0] == 0)
diff --git a/sql/winservice.h b/sql/winservice.h
index fca7b129de5..c3e2bfe1b20 100644
--- a/sql/winservice.h
+++ b/sql/winservice.h
@@ -1,40 +1,40 @@
-/*

-   Copyright (c) 2011, 2012, Monty Program Ab

-

-   This program is free software; you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; version 2 of the License.

-

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-

-   You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

-

-/*

-  Extract properties of a windows service binary path

-*/

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#include <windows.h> 

-typedef struct mysqld_service_properties_st

-{

-  char mysqld_exe[MAX_PATH];

-  char inifile[MAX_PATH];

-  char datadir[MAX_PATH];

-  int  version_major;

-  int  version_minor;

-  int  version_patch;

-} mysqld_service_properties;

-

-extern int get_mysql_service_properties(const wchar_t *bin_path, 

-  mysqld_service_properties *props);

-

-#ifdef __cplusplus

-}

-#endif

+/*
+   Copyright (c) 2011, 2012, Monty Program Ab
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/*
+  Extract properties of a windows service binary path
+*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <windows.h> 
+typedef struct mysqld_service_properties_st
+{
+  char mysqld_exe[MAX_PATH];
+  char inifile[MAX_PATH];
+  char datadir[MAX_PATH];
+  int  version_major;
+  int  version_minor;
+  int  version_patch;
+} mysqld_service_properties;
+
+extern int get_mysql_service_properties(const wchar_t *bin_path, 
+  mysqld_service_properties *props);
+
+#ifdef __cplusplus
+}
+#endif