CRLF->LF

8e7d6652 · Sergei Golubchik · 6bd76f8b · 8e7d6652 · 8e7d6652 · 8e7d6652
Commit 8e7d6652 authored Jun 02, 2015 by Sergei Golubchik
25 changed files
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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
 # Add executable plus some additional MySQL specific stuff
 # Usage (same as for standard CMake's ADD_EXECUTABLE)
 #
 # MYSQL_ADD_EXECUTABLE(target source1...sourceN)
 #
 # MySQL specifics:
 # - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
 # On Windows :
 # - add version resource
 # - instruct CPack to do autenticode signing if SIGNCODE is set
 INCLUDE(cmake_parse_arguments)
 FUNCTION (MYSQL_ADD_EXECUTABLE)
  # Pass-through arguments for ADD_EXECUTABLE
  MYSQL_PARSE_ARGUMENTS(ARG
   "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
   ""
   ${ARGN}
  )
  LIST(GET ARG_DEFAULT_ARGS 0 target)
  LIST(REMOVE_AT  ARG_DEFAULT_ARGS 0)
  SET(sources ${ARG_DEFAULT_ARGS})
  ADD_VERSION_INFO(${target} EXECUTABLE sources)
  ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})
  # tell CPack where to install
  IF(NOT ARG_EXCLUDE_FROM_ALL)
    IF(NOT ARG_DESTINATION)
      SET(ARG_DESTINATION ${INSTALL_BINDIR})
    ENDIF()
    IF(ARG_COMPONENT)
      SET(COMP COMPONENT ${ARG_COMPONENT})
    ELSEIF(MYSQL_INSTALL_COMPONENT)
      SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT})
    ELSE()
      SET(COMP COMPONENT Client)
    ENDIF()
    MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
  ENDIF()
 ENDFUNCTION()
--- a/cmake/versioninfo.rc.in
+++ b/cmake/versioninfo.rc.in
 // Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 // 
 // 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
 #include <windows.h>
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
 PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
 FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 FILEFLAGS       0
 FILEOS          VOS__WINDOWS32
 FILETYPE        @FILETYPE@
 FILESUBTYPE     VFT2_UNKNOWN
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904E4"
        BEGIN
            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1252
    END
 END
--- a/debian/po/it.po
+++ b/debian/po/it.po
 # Italian (it) translation of debconf templates for mysql-dfsg-5.1
 # Copyright (C) 2009 Software in the Public Interest
 # This file is distributed under the same license as the mysql-dfsg-5.1 package.
 # Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"

--- a/debian/po/sv.po
+++ b/debian/po/sv.po
 # Translation of mysql-dfsg-5.1 debconf template to Swedish
 # Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
 # This file is distributed under the same license as the mysql-dfsg-5.1 package.
 # 
 # Andreas Henriksson <andreas@fatal.se>, 2007
 # Martin Bagge <brother@bsnet.se>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n"

--- a/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_options.test
+++ b/mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_options.test
@@ -45,8 +45,8 @@ INSERT INTO t3 VALUES (1),(2);
 INSERT INTO test1.t1 VALUES (3,3);
 USE test1;
 LOAD DATA INFILE '../../std_data/loaddata7.dat' INTO TABLE t1
     FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n';
 DELETE FROM test3.t3 WHERE a=1;
 flush logs;

--- a/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
+++ b/mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
--- a/mysql-test/t/aborted_clients.test
+++ b/mysql-test/t/aborted_clients.test
 # Test case for MDEV-246, lp:992983
 # Check that ordinary connect/disconnect does not increase aborted_clients
 # status variable, but KILL connection does
 -- source include/not_embedded.inc
 -- source include/count_sessions.inc
 FLUSH STATUS;
 # Connect/Disconnect look that aborted_clients stays 0
 connect (con1,localhost,root,,);
 disconnect con1;
 connection default;
 -- source include/wait_until_count_sessions.inc
 # Check that there is 0 aborted clients so far
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
 # Kill a connection, check that aborted_clients is incremented
 connect(con2,localhost,root,,);
 --disable_reconnect
 --error ER_CONNECTION_KILLED
 KILL CONNECTION_ID();
 disconnect con2;
 connection default;
 -- source include/wait_until_count_sessions.inc
 # aborted clients must be 1 now
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='aborted_clients';
 FLUSH STATUS;
--- a/mysql-test/t/auth_rpl.test
+++ b/mysql-test/t/auth_rpl.test
 --source include/have_plugin_auth.inc
 --source include/not_embedded.inc
 --source include/master-slave.inc
 #
 # Check that replication slave can connect to master using an account
 # which authenticates with an external authentication plugin (bug#12897501).
 #
 # First stop the slave to guarantee that nothing is replicated.
 #
 --connection slave
 --echo [connection slave]
 --source include/stop_slave.inc
 #
 # Create an replication account on the master.
 #
 --connection master
 --echo [connection master]
 CREATE USER 'plug_user' IDENTIFIED WITH 'test_plugin_server' AS 'plug_user';
 GRANT REPLICATION SLAVE ON *.* TO plug_user;
 FLUSH PRIVILEGES;
 #
 # Now go to slave and change the replication user.
 #
 --connection slave
 --echo [connection slave]
 --let $master_user= query_get_value(SHOW SLAVE STATUS, Master_User, 1)
 CHANGE MASTER TO 
  MASTER_USER=     'plug_user',
  MASTER_PASSWORD= 'plug_user';
 #
 # Start slave with new replication account - this should trigger connection
 # to the master server.
 #
 --source include/start_slave.inc
 # Replicate all statements executed on master, in this case,
 # (creation of the plug_user account).
 #
 --connection master
 --sync_slave_with_master
 --echo # Slave in-sync with master now.
 SELECT user, plugin, authentication_string FROM mysql.user WHERE user LIKE 'plug_user';
 #
 # Now we can stop the slave and clean up.
 #
 # Note: it is important that slave is stopped at this
 # moment - otherwise master's cleanup statements
 # would be replicated on slave!
 #
 --echo # Cleanup (on slave).
 --source include/stop_slave.inc
 eval CHANGE MASTER TO MASTER_USER='$master_user';
 DROP USER 'plug_user';
 --echo # Cleanup (on master).
 --connection master
 DROP USER 'plug_user';
 --let $rpl_only_running_threads= 1
 --source include/rpl_end.inc
--- a/mysql-test/t/func_gconcat.test
+++ b/mysql-test/t/func_gconcat.test
@@ -49,9 +49,9 @@ select grp,group_concat(c order by grp desc) from t1 group by grp order by grp;
 # Test transfer to real values
 select grp, group_concat(a separator "")+0 from t1 group by grp;
 select grp, group_concat(a separator "")+0.0 from t1 group by grp;
 select grp, ROUND(group_concat(a separator "")) from t1 group by grp;
 drop table t1;
 # Test NULL values

--- a/mysql-test/t/lowercase_table4.test
+++ b/mysql-test/t/lowercase_table4.test
 --source include/have_case_insensitive_file_system.inc
 --source include/have_innodb.inc
 --echo #
 --echo # Bug#46941 crash with lower_case_table_names=2 and
 --echo #           foreign data dictionary confusion
 --echo #
 CREATE DATABASE XY;
 USE XY;
 #
 # Logs are disabled, since the number of creates tables
 # and subsequent select statements may vary between
 # versions
 #
 --disable_query_log
 --disable_result_log
 let $tcs = `SELECT @@table_open_cache + 1`;
 let $i = $tcs;
 while ($i)
 {
  eval CREATE TABLE XY.T_$i (a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, d INT, 
                             primary key(a, b), unique(b)) ENGINE=InnoDB;
  dec $i;
 }
 eval ALTER TABLE XY.T_$tcs ADD INDEX I1 (c, b), 
                           ADD CONSTRAINT C1 FOREIGN KEY (c, b) REFERENCES XY.T_1 (a, b);
 eval ALTER TABLE XY.T_$tcs ADD INDEX I2 (b),
                           ADD CONSTRAINT C2 FOREIGN KEY (b) REFERENCES XY.T_1(a);
 let $i = $tcs;
 while ($i)
 {
  eval SELECT * FROM XY.T_$i LIMIT 1;
  dec $i;
 }
 DROP DATABASE XY;
 CREATE DATABASE XY;
 USE XY;
 eval CREATE TABLE XY.T_$tcs (a INT NOT NULL, b INT NOT NULL, c INT NOT NULL, d INT, 
                             PRIMARY KEY(a, b), UNIQUE(b)) ENGINE=InnoDB;
 #
 # The bug causes this SELECT to err
 eval SELECT * FROM XY.T_$tcs LIMIT 1;
 --enable_query_log
 --enable_result_log
 DROP DATABASE XY;
 USE TEST;
 --echo #
 --echo # Bug55222 Mysqldump table names case bug in REFERENCES clause
 --echo # InnoDB did not handle lower_case_table_names=2 for
 --echo # foreign_table_names and referenced_table_names.
 --echo #
 SHOW VARIABLES LIKE 'lower_case_table_names';
 --disable_warnings
 DROP TABLE IF EXISTS `Table2`;
 DROP TABLE IF EXISTS `Table1`;
 --disable_warnings
 CREATE TABLE `Table1`(c1 INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE `Table2`(c1 INT PRIMARY KEY, c2 INT) ENGINE=InnoDB;
 ALTER TABLE `Table2` ADD CONSTRAINT fk1 FOREIGN KEY(c2) REFERENCES `Table1`(c1);
 query_vertical SHOW CREATE TABLE `Table2`;
 query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
 DROP TABLE `Table2`;
 DROP TABLE `Table1`;
 --disable_warnings
 DROP TABLE IF EXISTS Product_Order;
 DROP TABLE IF EXISTS Product;
 DROP TABLE IF EXISTS Customer;
 --enable_warnings
 CREATE TABLE Product (Category INT NOT NULL, Id INT NOT NULL,
 	Price DECIMAL, PRIMARY KEY(Category, Id)) ENGINE=InnoDB;
 CREATE TABLE Customer (Id INT NOT NULL, PRIMARY KEY (Id)) ENGINE=InnoDB;
 CREATE TABLE Product_Order (No INT NOT NULL AUTO_INCREMENT,
 	Product_Category INT NOT NULL,
 	Product_Id INT NOT NULL,
 	Customer_Id INT NOT NULL,
 	PRIMARY KEY(No),
 	INDEX (Product_Category, Product_Id),
 	FOREIGN KEY (Product_Category, Product_Id)
 		REFERENCES Product(Category, Id) ON UPDATE CASCADE ON DELETE RESTRICT,
 	INDEX (Customer_Id),
 	FOREIGN KEY (Customer_Id)
 		REFERENCES Customer(Id)
 	) ENGINE=INNODB;
 query_vertical SHOW CREATE TABLE Product_Order;
 query_vertical SHOW CREATE TABLE Product;
 query_vertical SHOW CREATE TABLE Customer;
 query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
 DROP TABLE Product_Order;
 DROP TABLE Product;
 DROP TABLE Customer;
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@@ -130,7 +130,7 @@ err:
 #elif defined(_WIN32)
 #include <winsock2.h>
 #include <iphlpapi.h>
 #pragma comment(lib, "iphlpapi.lib")
 #define ETHER_ADDR_LEN 6

--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -25,7 +25,7 @@
 #ifdef _MSC_VER
 #include <locale.h>
 #include <crtdbg.h>
 /* WSAStartup needs winsock library*/
 #pragma comment(lib, "ws2_32")
 #endif
 my_bool have_tcpip=0;

--- a/packaging/WiX/CPackWixConfig.cmake
+++ b/packaging/WiX/CPackWixConfig.cmake
 # Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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
 IF(ESSENTIALS)
 SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")
 SET(CPACK_WIX_UI "WixUI_InstallDir")
 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-winx64")
 ELSE()
  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-win32")
 ENDIF()
 ELSE()
  SET(CPACK_COMPONENTS_USED 
    "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")
 ENDIF()
 # Some components like Embedded are optional
 # We will build MSI without embedded if it was not selected for build
 #(need to modify CPACK_COMPONENTS_ALL for that)
 SET(CPACK_ALL)
 FOREACH(comp1 ${CPACK_COMPONENTS_USED})
 SET(found)
 FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
  IF(comp1 STREQUAL comp2)
    SET(found 1)
    BREAK()
  ENDIF()
 ENDFOREACH()
 IF(found)
   SET(CPACK_ALL ${CPACK_ALL} ${comp1})
 ENDIF()
 ENDFOREACH()
 SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
 # Always install (hidden), includes Readme files
 SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
 SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
 # Feature MySQL Server
 SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server")
 SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
 SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")
 # Subfeature "Server" (hidden)
 SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
 SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
 # Subfeature "Client" 
 SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
 SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
 SET(CPACK_COMPONENT_CLIENT_DESCRIPTION 
   "Various helpful (commandline) tools including the mysql command line client" )
 # Subfeature "Debug binaries" 
 SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
 SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
 SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION 
   "Debug/trace versions of executables and libraries" )
 #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
 #Subfeature "Data Files" 
 SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
 SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
 SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
 SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
 #Feature "Devel"
 SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
 SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
 #Subfeature "Development"
 SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
 SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
 #Subfeature "Shared libraries"
 SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
 SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
 SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
 #Subfeature "Embedded"
 SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
 SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
 SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
 SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
 #Feature Debug Symbols
 SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
 SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
 SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
 SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
 SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
 #Feature Documentation
 SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
 SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
 SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
 #Feature tests
 SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
 SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
 SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
 #Feature Misc (hidden, installs only if everything is installed)
 SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
 SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
  SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
  SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
--- a/packaging/WiX/custom_ui.wxs
+++ b/packaging/WiX/custom_ui.wxs
--- a/packaging/WiX/extra.wxs.in
+++ b/packaging/WiX/extra.wxs.in
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 <!--
   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
   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
 -->
  <!-- Datafiles that installation will copy to CommonAppData (initial database)
  They are declared Permanent and NeverOverwrite since it is user data -->
  <DirectoryRef Id='TARGETDIR'>
    <Directory Id="CommonAppDataFolder">
      <Directory Id="datadir.mysql" Name="MySQL">
        <Directory Id="datadir.mysql.mysqlserver"
          Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@">
          <Directory Id="DATADIR" Name=".">
            <Component Id="component.datadir" Guid="d3491319-5dbc-4477-95f3-4f809ef1dd2d">
              <CreateFolder>
                <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
              </CreateFolder>
            </Component>
            <Directory Id="datadir.mysql.mysqlserver.data" Name="data">
              <Directory Id="datadir.mysql.mysqlserver.data.mysql" Name="mysql">
                <Component Id="component.datadir.mysql"
                  Guid="19ec0f1f-1a7f-424e-a788-b09346c0a709"
                  Permanent="yes" NeverOverwrite="yes">
                  <CreateFolder>
                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
                  </CreateFolder>
                  @DATADIR_MYSQL_FILES@
                </Component>
              </Directory>
              <Directory Id="datadir.mysql.mysqlserver.data.performance_schema"
                 Name="performance_schema">
                <Component Id="component.datadir.performance_schema"
                  Guid="af2a6776-2655-431f-a748-9e9f4645acc3"
                  Permanent="yes" NeverOverwrite="yes">
                  <CreateFolder>
                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
                  </CreateFolder>
                  @DATADIR_PERFORMANCE_SCHEMA_FILES@
                </Component>
              </Directory>
              <Directory Id="datadir.mysql.mysqlserver.data.test" Name="test">
                <Component Id="component.datadir.test" Guid="52fa9f0a-fcd1-420a-b2ac-95a8f70ad20a">
                  <CreateFolder/>
                </Component>
              </Directory>
            </Directory>
          </Directory>
        </Directory>
      </Directory>
    </Directory>
  </DirectoryRef>
  <Feature Id='UserEditableDataFiles' 
       Title='Server data files'
       Description='Server data files'
       ConfigurableDirectory='DATADIR'
       Level='1'>
    <ComponentRef Id="component.datadir"/>
    <ComponentRef Id="component.datadir.mysql"/>
    <ComponentRef Id="component.datadir.performance_schema"/>
    <ComponentRef Id="component.datadir.test"/>
  </Feature>
 </Include>
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
--- a/sql-bench/limits/access_odbc.cfg
+++ b/sql-bench/limits/access_odbc.cfg
--- a/sql/message.h
+++ b/sql/message.h
 #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 */
--- a/sql/message.rc
+++ b/sql/message.rc
 LANGUAGE 0x9,0x1
 1 11 MSG00001.bin
--- 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);
  /* we disallow empty users */
  if (mi->user == NULL || mi->user[0] == 0)

--- a/sql/winservice.h
+++ b/sql/winservice.h
 /*
   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
--- a/storage/federatedx/CMakeLists.txt
+++ b/storage/federatedx/CMakeLists.txt
 SET(FEDERATEDX_PLUGIN_STATIC  "federatedx")
 SET(FEDERATEDX_PLUGIN_DYNAMIC "ha_federatedx")
 SET(FEDERATEDX_SOURCES  ha_federatedx.cc federatedx_txn.cc federatedx_io.cc federatedx_io_null.cc federatedx_io_mysql.cc)
 MYSQL_ADD_PLUGIN(federatedx ${FEDERATEDX_SOURCES} STORAGE_ENGINE)
--- a/storage/federatedx/README.windows
+++ b/storage/federatedx/README.windows
 The following files are changed in order to build a new engine on Windows:
 - Update win\configure.js with
 case "WITH_FEDERATEDX_STORAGE_ENGINE":
 to make sure it will pass WITH_FEDERATEDX_STORAGE_ENGINE in.
 - Update CMakeFiles.txt under mysql root:
  IF(WITH_FEDERATEDX_STORAGE_ENGINE)
      ADD_DEFINITIONS(-D WITH_FEDERATEDX_STORAGE_ENGINE)
  SET (mysql_plugin_defs
      "${mysql_plugin_defs},builtin_skeleton_plugin")
  ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
  and,
  IF(WITH_FEDERATEDX_STORAGE_ENGINE)
    ADD_SUBDIRECTORY(storage/skeleton/src)
  ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
  - Update CMakeFiles.txt under sql:
  IF(WITH_FEDERATEDX_STORAGE_ENGINE)
    TARGET_LINK_LIBRARIES(mysqld skeleton)
  ENDIF(WITH_FEDERATEDX_STORAGE_ENGINE)
--- a/storage/maria/ma_test_force_start.pl
+++ b/storage/maria/ma_test_force_start.pl
@@ -43,7 +43,7 @@ my $error_log_name= "./var/log/master.err";
 my @cmd_output;
 my $whatever; # garbage data
 $ENV{MTR_VERSION} = 1; # MTR2 does not have --start-and-exit
 my $base_server_cmd= "perl mysql-test-run.pl --mysqld=--aria-force-start-after-recovery-failures=$force_after --suite=maria maria.maria-recover ";
 if ($^O =~ /^mswin/i)
  {
    print <<EOF;