diff -pruN 5.5.40-1/client/CMakeLists.txt 5.5.42-1/client/CMakeLists.txt
--- 5.5.40-1/client/CMakeLists.txt	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/client/CMakeLists.txt	2015-01-06 20:39:40.000000000 +0000
@@ -35,6 +35,12 @@ ENDIF(UNIX)
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+# mysqltest has unused result errors, so we skip Werror
+CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
+IF(HAVE_WERROR_FLAG)
+  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+  ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
+ENDIF()
 TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 
 
diff -pruN 5.5.40-1/client/mysqlbinlog.cc 5.5.42-1/client/mysqlbinlog.cc
--- 5.5.40-1/client/mysqlbinlog.cc	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/client/mysqlbinlog.cc	2015-01-06 20:39:40.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -2102,6 +2102,7 @@ int main(int argc, char** argv)
   DBUG_PROCESS(argv[0]);
 
   my_init_time(); // for time functions
+  tzset(); // set tzname
 
   if (load_defaults("my", load_default_groups, &argc, &argv))
     exit(1);
diff -pruN 5.5.40-1/cmake/build_configurations/mysql_release.cmake 5.5.42-1/cmake/build_configurations/mysql_release.cmake
--- 5.5.40-1/cmake/build_configurations/mysql_release.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/build_configurations/mysql_release.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -189,15 +189,16 @@ IF(UNIX)
     ENDIF()
   ENDIF()
 
-  # OSX flags
-  IF(APPLE)
-    SET(COMMON_C_FLAGS                 "-g -fno-common -fno-strict-aliasing")
-    # XXX: why are we using -felide-constructors on OSX?
-    SET(COMMON_CXX_FLAGS               "-g -fno-common -felide-constructors -fno-strict-aliasing")
-    SET(CMAKE_C_FLAGS_DEBUG            "-O ${COMMON_C_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-O ${COMMON_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-Os ${COMMON_C_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${COMMON_CXX_FLAGS}")
+  # Default Clang flags
+  IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+  ENDIF()
+  IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
 
   # Solaris flags
diff -pruN 5.5.40-1/cmake/compile_flags.cmake 5.5.42-1/cmake/compile_flags.cmake
--- 5.5.40-1/cmake/compile_flags.cmake	1970-01-01 00:00:00.000000000 +0000
+++ 5.5.42-1/cmake/compile_flags.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -0,0 +1,44 @@
+# Copyright (c) 2014, 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_COMPILE_FLAGS(<source files> COMPILE_FLAGS <flags>)
+MACRO(ADD_COMPILE_FLAGS)
+  SET(FILES "")
+  SET(FLAGS "")
+  SET(COMPILE_FLAGS)
+  FOREACH(ARG ${ARGV})
+    IF(ARG STREQUAL "COMPILE_FLAGS")
+      SET(COMPILE_FLAGS "COMPILE_FLAGS")
+    ELSEIF(COMPILE_FLAGS)
+      LIST(APPEND FLAGS ${ARG})
+    ELSE()
+      LIST(APPEND FILES ${ARG})
+    ENDIF()
+  ENDFOREACH()
+  FOREACH(FILE ${FILES})
+    FOREACH(FLAG ${FLAGS})
+      GET_SOURCE_FILE_PROPERTY(PROP ${FILE} COMPILE_FLAGS)
+      IF(NOT PROP)
+        SET(PROP ${FLAG})
+      ELSE()
+        SET(PROP "${PROP} ${FLAG}")
+      ENDIF()
+      SET_SOURCE_FILES_PROPERTIES(
+        ${FILE} PROPERTIES COMPILE_FLAGS "${PROP}"
+        )
+    ENDFOREACH()
+  ENDFOREACH()
+ENDMACRO()
diff -pruN 5.5.40-1/cmake/cpack_source_ignore_files.cmake 5.5.42-1/cmake/cpack_source_ignore_files.cmake
--- 5.5.40-1/cmake/cpack_source_ignore_files.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/cpack_source_ignore_files.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -14,9 +14,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
 
 SET(CPACK_SOURCE_IGNORE_FILES
-\\\\.bzr/
-\\\\.bzr-mysql
-\\\\.bzrignore
 CMakeCache\\\\.txt
 cmake_dist\\\\.cmake
 CPackSourceConfig\\\\.cmake
diff -pruN 5.5.40-1/cmake/info_macros.cmake.in 5.5.42-1/cmake/info_macros.cmake.in
--- 5.5.40-1/cmake/info_macros.cmake.in	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/info_macros.cmake.in	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -23,11 +23,14 @@
 # If further variables are used in this file, add them to this list.
 
 SET(VERSION "@VERSION@")
+SET(MAJOR_VERSION "@MAJOR_VERSION@")
+SET(MINOR_VERSION "@MINOR_VERSION@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")
-SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
+SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@")
 SET(CMAKE_CROSSCOMPILING "@CMAKE_CROSSCOMPILING@")
 SET(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@")
 SET(CMAKE_HOST_SYSTEM_PROCESSOR "@CMAKE_HOST_SYSTEM_PROCESSOR@")
@@ -36,27 +39,51 @@ SET(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTE
  
  
 # Create an "INFO_SRC" file with information about the source (only).
-# We use "bzr version-info", if possible, and the "VERSION" contents.
+# We use "git log", if possible, and the "VERSION" contents.
 #
-# Outside development (BZR tree), the "INFO_SRC" file will not be modified
+# Outside development (git tree), the "INFO_SRC" file will not be modified
 # provided it exists (from "make dist" or a source tarball creation).
 
 MACRO(CREATE_INFO_SRC target_dir)
   SET(INFO_SRC "${target_dir}/INFO_SRC")
 
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/.bzr)
-    # Sources are in a BZR repository: Always update.
+  SET(PERLSCRIPT
+    "use warnings; use POSIX qw(strftime); "
+    "print strftime \"%F %T %z\", localtime;")
+  EXECUTE_PROCESS(
+    COMMAND perl -e "${PERLSCRIPT}"
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE bdate
+    ERROR_VARIABLE error
+  )
+  IF(error)
+    MESSAGE(STATUS "Could not determine build-date: <${error}>")
+  ENDIF()
+
+  IF(GIT_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+    # Sources are in a GIT repository: Always update.
     EXECUTE_PROCESS(
-      COMMAND ${BZR_EXECUTABLE} version-info ${CMAKE_SOURCE_DIR}
+      COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE bname
+    )
+
+    EXECUTE_PROCESS(
+      COMMAND ${GIT_EXECUTABLE} log -1
+      --pretty="commit: %H%ndate: %ci%nbuild-date: ${bdate} %nshort: %h%nbranch: ${bname}"
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       OUTPUT_VARIABLE VERSION_INFO
-      RESULT_VARIABLE RESULT
     )
+
+    ## Output from git is quoted with "", remove them.
+    STRING(REPLACE "\"" "" VERSION_INFO "${VERSION_INFO}")
     FILE(WRITE ${INFO_SRC} "${VERSION_INFO}\n")
     # to debug, add: FILE(APPEND ${INFO_SRC} "\nResult ${RESULT}\n")
     # For better readability ...
-    FILE(APPEND ${INFO_SRC} "\nMySQL source ${VERSION}\n")
+    FILE(APPEND ${INFO_SRC}
+      "MySQL source ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}\n")
   ELSEIF(EXISTS ${INFO_SRC})
-    # Outside a BZR tree, there is no need to change an existing "INFO_SRC",
+    # Outside a git tree, there is no need to change an existing "INFO_SRC",
     # it cannot be improved.
   ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
     # If we are building from a source distribution, it also contains "INFO_SRC".
diff -pruN 5.5.40-1/cmake/info_src.cmake 5.5.42-1/cmake/info_src.cmake
--- 5.5.40-1/cmake/info_src.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/info_src.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -16,11 +16,11 @@
 
 # The sole purpose of this cmake control file is to create the "INFO_SRC" file.
 
-# As long as and "bzr pull" (or "bzr commit") is followed by a "cmake",
+# As long as and "git pull" (or "git commit") is followed by a "cmake",
 # the call in top level "CMakeLists.txt" is sufficient.
 # This file is to provide a separate target for the "make" phase,
-# to ensure the BZR revision-id is correct even after a sequence
-#   cmake ; make ; bzr pull ; make
+# to ensure the git commit hash is correct even after a sequence
+#   cmake ; make ; git pull ; make
 
 
 # Get the macros which handle the "INFO_*" files.
diff -pruN 5.5.40-1/cmake/maintainer.cmake 5.5.42-1/cmake/maintainer.cmake
--- 5.5.40-1/cmake/maintainer.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/maintainer.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -13,42 +13,39 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-INCLUDE(CheckCCompilerFlag)
-
-# Setup GCC (GNU C compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS
-      "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror")
-  CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
-                        HAVE_DECLARATION_AFTER_STATEMENT)
-  IF(HAVE_DECLARATION_AFTER_STATEMENT)
-    SET(MY_MAINTAINER_DECLARATION_AFTER_STATEMENT
-        "-Wdeclaration-after-statement")
-  ENDIF()
-  SET(MY_MAINTAINER_C_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}"
-      CACHE STRING "C warning options used in maintainer builds.")
-  # Do not make warnings in checks into errors.
-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error")
-ENDMACRO()
-
-# Setup G++ (GNU C++ compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} -Wno-unused-parameter -Woverloaded-virtual"
-      CACHE STRING "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICC (Intel C Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS "-Wcheck")
-  SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-      CACHE STRING "C warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICPC (Intel C++ Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-      CACHE STRING "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
+# Common warning flags for GCC, G++, Clang and Clang++
+SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security")
+MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
+IF(HAVE_WVLA)
+  SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
+ENDIF()
+
+# Common warning flags for GCC and Clang
+SET(MY_C_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Wwrite-strings -Wdeclaration-after-statement")
+
+# Common warning flags for G++ and Clang++
+SET(MY_CXX_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Woverloaded-virtual -Wno-unused-parameter")
+
+# Extra warning flags for Clang++
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(MY_CXX_WARNING_FLAGS
+      "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
+ENDIF()
+
+# Turn on Werror (warning => error) when using maintainer mode.
+IF(MYSQL_MAINTAINER_MODE)
+  SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
+  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
+  SET(COMPILE_FLAG_WERROR 1)
+ENDIF()
+
+# Set warning flags for GCC/Clang
+IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")
+ENDIF()
+# Set warning flags for G++/Clang++
+IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_WARNING_FLAGS}")
+ENDIF()
diff -pruN 5.5.40-1/cmake/make_dist.cmake.in 5.5.42-1/cmake/make_dist.cmake.in
--- 5.5.40-1/cmake/make_dist.cmake.in	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/make_dist.cmake.in	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 # Make source distribution
-# If bzr is present, run bzr export.
+# If git is present, run git archive.
 # Otherwise, just run cpack with source configuration.
 
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
@@ -22,13 +22,12 @@ SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "@CPACK_SOURCE_PACKAGE_FILE_NAME@")
 SET(CMAKE_CPACK_COMMAND  "@CMAKE_CPACK_COMMAND@")
 SET(CMAKE_COMMAND  "@CMAKE_COMMAND@")
-SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
+SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@")
 SET(GTAR_EXECUTABLE "@GTAR_EXECUTABLE@")
 SET(TAR_EXECUTABLE "@TAR_EXECUTABLE@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_MAKE_PROGRAM "@CMAKE_MAKE_PROGRAM@")
 SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
-SET(PLUGIN_REPOS "@PLUGIN_REPOS@")
 
 SET(VERSION "@VERSION@")
 
@@ -40,38 +39,54 @@ SET(PACKAGE_DIR  ${CMAKE_BINARY_DIR}/${C
 FILE(REMOVE_RECURSE ${PACKAGE_DIR})
 FILE(REMOVE ${PACKAGE_DIR}.tar.gz )
 
-IF(BZR_EXECUTABLE)
-  MESSAGE(STATUS "Running bzr export")
+# Only allow git if source dir itself is a git repository
+IF(GIT_EXECUTABLE)
   EXECUTE_PROCESS(
-    COMMAND "${BZR_EXECUTABLE}" export 
-    ${PACKAGE_DIR}
+    COMMAND "${GIT_EXECUTABLE}" rev-parse --show-toplevel
+    OUTPUT_VARIABLE GIT_ROOT
+    ERROR_VARIABLE GIT_ROOT_ERROR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     RESULT_VARIABLE RESULT
   )
 
-  IF(NOT RESULT EQUAL 0)
-   SET(BZR_EXECUTABLE)
+  IF(NOT RESULT EQUAL 0 OR NOT GIT_ROOT STREQUAL ${CMAKE_SOURCE_DIR})
+    MESSAGE(STATUS "This is not a git repository")
+    SET(GIT_EXECUTABLE)
   ENDIF()
 ENDIF()
 
-IF(BZR_EXECUTABLE)
-  FOREACH(REPO ${PLUGIN_REPOS})
-    GET_FILENAME_COMPONENT(PLUGIN_NAME ${REPO} NAME)
-    SET(DEST ${PACKAGE_DIR}/plugin/${PLUGIN_NAME})
-    MESSAGE(STATUS "Running bzr export for plugin/${PLUGIN_NAME}")
+IF(GIT_EXECUTABLE)
+  MESSAGE(STATUS "Running git archive -o ${PACKAGE_DIR}.tar")
+  EXECUTE_PROCESS(
+    COMMAND "${GIT_EXECUTABLE}" archive --format=tar
+    --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ -o ${PACKAGE_DIR}.tar HEAD
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE RESULT
+  )
+  IF(NOT RESULT EQUAL 0)
+    SET(GIT_EXECUTABLE)
+  ELSE()
+    # Unpack tarball
     EXECUTE_PROCESS(
-      COMMAND "${BZR_EXECUTABLE}" export ${DEST}
-      WORKING_DIRECTORY ${REPO}
-      RESULT_VARIABLE RESULT
+      COMMAND ${CMAKE_COMMAND} -E tar xf ${PACKAGE_DIR}.tar
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      RESULT_VARIABLE TAR_RESULT
     )
-    IF(NOT RESULT EQUAL 0)
-      MESSAGE(STATUS "bzr export failed")
+    IF(NOT TAR_RESULT EQUAL 0)
+      SET(GIT_EXECUTABLE)
+    ELSE()
+      # Remove tarball after unpacking
+      EXECUTE_PROCESS(
+        COMMAND ${CMAKE_COMMAND} -E remove ${PACKAGE_DIR}.tar
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      )
     ENDIF()
-  ENDFOREACH()
+  ENDIF()
 ENDIF()
 
-IF(NOT BZR_EXECUTABLE)
-  MESSAGE(STATUS "bzr not found or source dir is not a repo, use CPack")
+IF(NOT GIT_EXECUTABLE)
+  MESSAGE(STATUS "git not found or source dir is not a repo, use CPack")
   
   IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     # In-source build is the worst option, we have to cleanup source tree.
diff -pruN 5.5.40-1/cmake/os/Darwin.cmake 5.5.42-1/cmake/os/Darwin.cmake
--- 5.5.40-1/cmake/os/Darwin.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/os/Darwin.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -1,5 +1,4 @@
-# Copyright (c) 2010 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2010, 2014, 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
@@ -15,21 +14,3 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 # This file includes OSX specific options and quirks, related to system checks
-
-# Workaround for CMake bug#9051
-# (CMake does not pass CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET when 
-# running TRY_COMPILE)
-
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{CMAKE_OSX_SYSROOT} ${CMAKE_OSX_SYSROOT})
-ENDIF()
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSX_DEPLOYMENT_TARGET})
-ENDIF()
-
-IF(CMAKE_OSX_DEPLOYMENT_TARGET)
-  # Workaround linker problems  on OSX 10.4
-  IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.5")
-    ADD_DEFINITIONS(-fno-common)
-  ENDIF()
-ENDIF()
diff -pruN 5.5.40-1/cmake/os/WindowsCache.cmake 5.5.42-1/cmake/os/WindowsCache.cmake
--- 5.5.40-1/cmake/os/WindowsCache.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/os/WindowsCache.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -88,7 +88,7 @@ SET(HAVE_GETRLIMIT CACHE  INTERNAL "")
 SET(HAVE_GETRUSAGE CACHE  INTERNAL "")
 SET(HAVE_GETTIMEOFDAY CACHE  INTERNAL "")
 SET(HAVE_GETWD CACHE  INTERNAL "")
-SET(HAVE_GMTIME_R CACHE  INTERNAL "")
+SET(HAVE_GMTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_GRP_H CACHE  INTERNAL "")
 SET(HAVE_IA64INTRIN_H CACHE  INTERNAL "")
 SET(HAVE_IEEEFP_H CACHE  INTERNAL "")
@@ -109,7 +109,7 @@ SET(HAVE_LANGINFO_H CACHE  INTERNAL "")
 SET(HAVE_LDIV 1 CACHE  INTERNAL "")
 SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")
 SET(HAVE_LOCALE_H 1 CACHE  INTERNAL "")
-SET(HAVE_LOCALTIME_R CACHE  INTERNAL "")
+SET(HAVE_LOCALTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_LOG2 CACHE  INTERNAL "")
 SET(HAVE_LONGJMP 1 CACHE  INTERNAL "")
 SET(HAVE_LRAND48 CACHE  INTERNAL "")
diff -pruN 5.5.40-1/cmake/plugin.cmake 5.5.42-1/cmake/plugin.cmake
--- 5.5.40-1/cmake/plugin.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/cmake/plugin.cmake	2015-01-06 20:39:40.000000000 +0000
@@ -232,11 +232,4 @@ MACRO(CONFIGURE_PLUGINS)
       ADD_SUBDIRECTORY(${dir})
     ENDIF()
   ENDFOREACH()
-  FOREACH(dir ${dirs_plugin})
-    IF (EXISTS ${dir}/.bzr)
-      MESSAGE(STATUS "Found repo ${dir}/.bzr")
-      LIST(APPEND PLUGIN_BZR_REPOS "${dir}")
-    ENDIF()
-  ENDFOREACH()
-  SET(PLUGIN_REPOS "${PLUGIN_BZR_REPOS}" CACHE INTERNAL "")
 ENDMACRO()
diff -pruN 5.5.40-1/CMakeLists.txt 5.5.42-1/CMakeLists.txt
--- 5.5.40-1/CMakeLists.txt	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/CMakeLists.txt	2015-01-06 20:39:40.000000000 +0000
@@ -27,14 +27,19 @@ ENDIF()
 
 # We use the LOCATION target property (CMP0026)
 # and get_target_property() for non-existent targets (CMP0045)
+# and INSTALL_NAME_DIR (CMP0042)
 IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
    CMAKE_VERSION VERSION_GREATER "3.0.0")
  CMAKE_POLICY(SET CMP0026 OLD)
  CMAKE_POLICY(SET CMP0045 OLD)
+ CMAKE_POLICY(SET CMP0042 OLD)
 ENDIF()
 
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
+# Will set GIT_EXECUTABLE and GIT_FOUND
+FIND_PACKAGE(Git)
+
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # First, decide about build type (debug or release)
@@ -73,11 +78,9 @@ ENDIF()
 SET(BUILDTYPE_DOCSTRING
  "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
  CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
- 
+
 IF(WITH_DEBUG)
   SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
-  SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
-      "MySQL maintainer-specific development environment")
   IF(UNIX AND NOT APPLE)
     # Compiling with PIC speeds up embedded build, on PIC sensitive systems 
     # Predefine it to ON, in case user chooses to build embedded. 
@@ -107,6 +110,15 @@ ELSE()
 ENDIF()
 PROJECT(${MYSQL_PROJECT_NAME})
 
+# Maintainer mode is default on only for Linux debug builds using GCC/G++
+IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
+  IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND
+     CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
+    SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
+        "MySQL maintainer-specific development environment")
+  ENDIF()
+ENDIF()
+
 IF(BUILD_CONFIG)
   INCLUDE(
   ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
@@ -130,38 +142,12 @@ FOREACH(_base
 ENDFOREACH()
 
 
-
 # Following autotools tradition, add preprocessor definitions
 # specified in environment variable CPPFLAGS
 IF(DEFINED ENV{CPPFLAGS})
   ADD_DEFINITIONS($ENV{CPPFLAGS})
 ENDIF()
 
-#
-# Control aspects of the development environment which are
-# specific to MySQL maintainers and developers.
-#
-INCLUDE(maintainer)
-
-OPTION(MYSQL_MAINTAINER_MODE
-       "MySQL maintainer-specific development environment" OFF)
-
-# Whether the maintainer mode compiler options should be enabled.
-IF(MYSQL_MAINTAINER_MODE)
-  IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
-    SET_MYSQL_MAINTAINER_GNU_C_OPTIONS()
-  ENDIF()
-  IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS()
-  ENDIF()
-  IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
-    SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS()
-  ENDIF()
-  IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS()
-  ENDIF()
-ENDIF()
-
 # Add macros
 INCLUDE(character_sets)
 INCLUDE(zlib)
@@ -192,7 +178,6 @@ OPTION (WITH_UNIT_TESTS "Compile MySQL w
 MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
 
 
-
 include(CheckCSourceCompiles)
 include(CheckCXXSourceCompiles)
 # We need some extra FAIL_REGEX patterns
@@ -373,13 +358,13 @@ MYSQL_CHECK_READLINE()
 # not run with the warning options as to not perturb fragile checks
 # (i.e. do not make warnings into errors).
 #
-IF(MYSQL_MAINTAINER_MODE)
-  # Set compiler flags required under maintainer mode.
-  MESSAGE(STATUS "C warning options: ${MY_MAINTAINER_C_WARNINGS}")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}")
-  MESSAGE(STATUS "C++ warning options: ${MY_MAINTAINER_CXX_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}")
-ENDIF()
+# Why doesn't these flags affect the entire build?
+# Because things may already have been included with ADD_SUBDIRECTORY
+#
+OPTION(MYSQL_MAINTAINER_MODE
+       "MySQL maintainer-specific development environment" OFF)
+
+INCLUDE(maintainer)
 
 IF(NOT WITHOUT_SERVER)
 SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
@@ -395,7 +380,6 @@ ADD_SUBDIRECTORY(regex)
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(libmysql)
 
-
 IF(WITH_UNIT_TESTS)
  ENABLE_TESTING()
 ENDIF()
@@ -430,6 +414,7 @@ IF(NOT WITHOUT_SERVER)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
   ADD_SUBDIRECTORY(packaging/rpm-oel)
+  ADD_SUBDIRECTORY(packaging/rpm-sles)
 ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
@@ -442,13 +427,14 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/inclu
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
     ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
 CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
+    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
+    ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
 
 # Handle the "INFO_*" files.
 INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
 # Source: This can be done during the cmake phase, all information is
 # available, but should be repeated on each "make" just in case someone
-# does "cmake ; make ; bzr pull ; make".
+# does "cmake ; make ; git pull ; make".
 CREATE_INFO_SRC(${CMAKE_BINARY_DIR}/Docs)
 ADD_CUSTOM_TARGET(INFO_SRC ALL
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_src.cmake
@@ -487,7 +473,6 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   )
   INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
-  
   IF(UNIX)
     INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   ENDIF()
@@ -507,3 +492,37 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
 ENDIF()
 
 INCLUDE(CPack)
+
+# C compiler flags consist of:
+# CPPFLAGS        Taken from environment, see above.
+# ADD_DEFINITIONS In each individual CMakeLists.txt
+# CMAKE_C_FLAGS   From command line.
+#                 We extend these in maintainer.cmake
+# ENV{CFLAGS}     From environment, but environment is ignored if
+#                 CMAKE_C_FLAGS is also given on command line
+# CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}
+#                 We extend these in compiler_options.cmake
+#
+# Note that CMakeCache.txt contains cmake builtins for these variables,
+# *not* the values that will actually be used:
+
+IF(CMAKE_GENERATOR MATCHES "Makefiles")
+  MESSAGE(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+ENDIF()
+GET_PROPERTY(cwd_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+MESSAGE(STATUS "COMPILE_DEFINITIONS: ${cwd_definitions}")
+MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+MESSAGE(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+IF(CMAKE_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Makefiles")
+  STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
+  MESSAGE(STATUS "CMAKE_C_FLAGS_${CMAKEBT}: ${CMAKE_C_FLAGS_${CMAKEBT}}")
+  MESSAGE(STATUS "CMAKE_CXX_FLAGS_${CMAKEBT}: ${CMAKE_CXX_FLAGS_${CMAKEBT}}")
+ENDIF()
+IF(NOT CMAKE_GENERATOR MATCHES "Makefiles")
+  MESSAGE(STATUS "CMAKE_C_FLAGS_DEBUG: ${CMAKE_C_FLAGS_DEBUG}")
+  MESSAGE(STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
+  MESSAGE(STATUS
+    "CMAKE_C_FLAGS_RELWITHDEBINFO: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  MESSAGE(STATUS
+    "CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+ENDIF()
diff -pruN 5.5.40-1/configure.cmake 5.5.42-1/configure.cmake
--- 5.5.40-1/configure.cmake	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/configure.cmake	2015-01-06 20:39:39.000000000 +0000
@@ -53,15 +53,6 @@ IF(NOT SYSTEM_TYPE)
 ENDIF()
 
 
-# Always enable -Wall for gnu C/C++
-IF(CMAKE_COMPILER_IS_GNUCXX)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter")
-ENDIF()
-IF(CMAKE_COMPILER_IS_GNUCC)
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-ENDIF()
-
-
 IF(CMAKE_COMPILER_IS_GNUCXX)
   # MySQL "canonical" GCC flags. At least -fno-rtti flag affects
   # ABI and cannot be simply removed. 
diff -pruN 5.5.40-1/debian/additions/my.cnf 5.5.42-1/debian/additions/my.cnf
--- 5.5.40-1/debian/additions/my.cnf	2014-11-24 16:32:52.000000000 +0000
+++ 5.5.42-1/debian/additions/my.cnf	2015-02-09 10:33:49.000000000 +0000
@@ -77,9 +77,10 @@ query_cache_size        = 16M
 log_error = /var/log/mysql/error.log
 #
 # Here you can see queries with especially long duration
-#log_slow_queries	= /var/log/mysql/mysql-slow.log
+#slow_query_log_file = /var/log/mysql/mysql-slow.log
+#slow_query_log      = 1
 #long_query_time = 2
-#log-queries-not-using-indexes
+#log_queries_not_using_indexes
 #
 # The following can be used as easy to replay backup logs or for replication.
 # note: if you are setting up a replication slave, see README.Debian about
diff -pruN 5.5.40-1/debian/changelog 5.5.42-1/debian/changelog
--- 5.5.40-1/debian/changelog	2014-11-24 16:54:16.000000000 +0000
+++ 5.5.42-1/debian/changelog	2015-02-09 14:13:08.000000000 +0000
@@ -1,3 +1,21 @@
+mysql-5.5 (5.5.42-1) unstable; urgency=medium
+
+  [ James Page ]
+  * SECURITY UPDATE: Update to 5.5.41 to fix security issues:
+    - http://www.oracle.com/technetwork/topics/security/cpujan2015-1972971.html
+    - CVE-2015-0411, CVE-2015-0382, CVE-2015-0381, CVE-2015-0432,
+      CVE-2014-6568, CVE-2015-0374
+    (Closes: #775881).
+  * d/p/fix-func_math-test-failure.patch: Dropped, included upstream.
+
+  [ Akhil Mohan ]
+  * New upstream version, resolving date driven test failures in certs.
+  * Example option in log_slow_queries d/additions/my.cnf is deprecated
+    and replaced with options slow_query_log_file and slow_query_log.
+    (Closes: #677222)
+
+ -- James Page <james.page@ubuntu.com>  Mon, 09 Feb 2015 14:12:44 +0000
+
 mysql-5.5 (5.5.40-1) unstable; urgency=medium
 
   * SECURITY UPDATE: Update to 5.5.40 to fix security issues:
diff -pruN 5.5.40-1/debian/patches/fix-func_math-test-failure.patch 5.5.42-1/debian/patches/fix-func_math-test-failure.patch
--- 5.5.40-1/debian/patches/fix-func_math-test-failure.patch	2014-11-24 16:32:52.000000000 +0000
+++ 5.5.42-1/debian/patches/fix-func_math-test-failure.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-Description: Resolve test failure due to compiler optimization break
-Author: norvald.ryeng@oracle.com
-Forwarded: no
-Bug: http://bugs.mysql.com/bug.php?id=72827
-
---- a/sql/item_func.cc
-+++ b/sql/item_func.cc
-@@ -1760,7 +1760,13 @@ longlong Item_func_neg::int_op()
-   if ((null_value= args[0]->null_value))
-     return 0;
-   if (args[0]->unsigned_flag &&
--      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1)
-+      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1ULL)
-+    return raise_integer_overflow();
-+  // For some platforms we need special handling of LONGLONG_MIN to
-+  // guarantee overflow.
-+  if (value == LONGLONG_MIN &&
-+      !args[0]->unsigned_flag &&
-+      !unsigned_flag)
-     return raise_integer_overflow();
-   return check_integer_overflow(-value, !args[0]->unsigned_flag && value < 0);
- }
---- a/sql/item_func.h
-+++ b/sql/item_func.h
-@@ -251,7 +251,8 @@ public:
-   inline longlong check_integer_overflow(longlong value, bool val_unsigned)
-   {
-     if ((unsigned_flag && !val_unsigned && value < 0) ||
--        (!unsigned_flag && val_unsigned && (ulonglong) value > LONGLONG_MAX))
-+        (!unsigned_flag && val_unsigned &&
-+         (ulonglong) value > (ulonglong) LONGLONG_MAX))
-       return raise_integer_overflow();
-     return value;
-   }
diff -pruN 5.5.40-1/debian/patches/series 5.5.42-1/debian/patches/series
--- 5.5.40-1/debian/patches/series	2014-11-24 16:32:52.000000000 +0000
+++ 5.5.42-1/debian/patches/series	2015-02-09 10:33:49.000000000 +0000
@@ -12,5 +12,4 @@ fix-mips64el-ftbfs.patch
 33_scripts__mysql_create_system_tables__no_test.patch
 41_scripts__mysql_install_db.sh__no_test.patch
 50_mysql-test__db_test.patch
-fix-func_math-test-failure.patch
 fix-mysqlhotcopy-test-failure.patch
diff -pruN 5.5.40-1/Docs/ChangeLog 5.5.42-1/Docs/ChangeLog
--- 5.5.40-1/Docs/ChangeLog	2014-09-08 09:53:25.000000000 +0000
+++ 5.5.42-1/Docs/ChangeLog	2015-01-06 20:39:51.000000000 +0000
@@ -1,196 +1 @@
-------------------------------------------------------------
-revno: 4703
-committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
-branch nick: mysql-5.5.40-release
-timestamp: Mon 2014-09-08 11:33:55 +0200
-message:
-  Adding patch for security bug 19471516
-------------------------------------------------------------
-revno: 4702
-committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
-branch nick: mysql-5.5.40-release
-timestamp: Fri 2014-09-05 08:37:21 +0200
-message:
-  Applying the patch to remove WL#7219 which was by mistake included by the dev team.
-------------------------------------------------------------
-revno: 4701
-committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
-branch nick: mysql-5.5.40-release
-timestamp: Tue 2014-08-26 14:01:38 +0200
-message:
-  Renaming the enterprise packages to commercial
-------------------------------------------------------------
-revno: 4700
-tags: clone-5.5.40-build
-committer: Harin Vadodaria <harin.vadodaria@oracle.com>
-branch nick: 5.5
-timestamp: Sat 2014-08-23 08:59:03 +0530
-message:
-  Bug#19370676 : YASSL PRE-AUTH BUFFER OVERFLOW WHEN CLIENT
-                 LIES ABOUT SUITE_LEN_
-                 and
-  Bug#19355577 : YASSL PRE-AUTH BUFFER OVERFLOW WHEN CLIENT
-                 LIES ABOUT COMP_LEN_
-  
-  Description : Updating yaSSL to version 2.3.4.
-------------------------------------------------------------
-revno: 4699
-committer: Tor Didriksen <tor.didriksen@oracle.com>
-branch nick: 5.5
-timestamp: Thu 2014-08-21 16:42:04 +0200
-message:
-  Bug#18928848 II. MALLOC OF UNINITIALIZED MEMORY SIZE
-  
-  Several string functions have optimizations for constant
-  sub-expressions which lead to setting max_length == 0.
-  
-  For subqueries, where we need a temporary table to holde the result,
-  we need to ensure that we use a VARCHAR(0) column rather than a
-  CHAR(0) column when such expressions take part in grouping.
-  With CHAR(0) end_update() may write garbage into the next field.
-------------------------------------------------------------
-revno: 4698 [merge]
-committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2014-08-20 09:46:38 +0200
-message:
-  Add my.cnf.d to regular rpm for EL7 build
-    ------------------------------------------------------------
-    revno: 4676.2.7
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.39-ol7-release
-    timestamp: Tue 2014-08-12 19:37:49 +0200
-    message:
-      Corrected typo
-    ------------------------------------------------------------
-    revno: 4676.2.6
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.39-ol7-release
-    timestamp: Tue 2014-08-12 18:55:05 +0200
-    message:
-      Experimental testing
-    ------------------------------------------------------------
-    revno: 4676.2.5
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.39-ol7-release
-    timestamp: Tue 2014-08-12 18:26:46 +0200
-    message:
-      Experimental testing for patch
-    ------------------------------------------------------------
-    revno: 4676.2.4
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.39-ol7-release
-    timestamp: Tue 2014-08-12 16:53:31 +0200
-    message:
-      Added my.cnf.d directory, removed mysql-5.5-libmysqlclient-symbols.patch
-    ------------------------------------------------------------
-    revno: 4676.2.3
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.39-ol7-release
-    timestamp: Tue 2014-08-12 14:32:16 +0200
-    message:
-      Add patch mysql-5.5-libmysqlclient-symbols.patch for el7
-------------------------------------------------------------
-revno: 4697
-committer: mithun <mithun.c.y@oracle.com>
-branch nick: mysql-5.5
-timestamp: Tue 2014-08-12 17:16:51 +0530
-message:
-  Bug #11755818 : LIKE DOESN'T MATCH WHEN CP932_BIN/SJIS_BIN
-                  COLLATIONS ARE USED.
-  
-  ISSUE :
-  -------
-  Code points of HALF WIDTH KATAKANA in SJIS/CP932 range from
-  A1 to DF. In function my_wildcmp_mb_bin_impl while comparing
-  such single byte code points, there is a code which compares
-  signed character with unsigned character. Because of this,
-  comparisons of two same code points representing a HALF
-  WIDTH KATAKANA character always fails.
-  
-  Solution:
-  ---------
-  A code point of HALF WIDTH KATAKANA at-least need 8 bits.
-  Promoting the variable from uchar to int will fix the issue.
-------------------------------------------------------------
-revno: 4696 [merge]
-committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2014-08-06 09:56:37 +0200
-message:
-  - Merge from mysql-5.5.39-ol7-release branch
-  - Reverted version variable 
-    ------------------------------------------------------------
-    revno: 4676.2.2
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.39-ol7-release
-    timestamp: Mon 2014-08-04 15:56:19 +0200
-    message:
-      Updated for el7 regular rpms
-    ------------------------------------------------------------
-    revno: 4676.2.1
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.39-ol7-release
-    timestamp: Thu 2014-07-24 11:37:40 +0200
-    message:
-      Bug#19223915 Provide mysql-compat-server dependencies
-------------------------------------------------------------
-revno: 4695
-committer: bin.x.su@oracle.com
-branch nick: mysql-5.5
-timestamp: Wed 2014-08-06 09:51:20 +0800
-message:
-  Remove unstable test case innodb_bug18942294, approved by Jimmy over IM.
-------------------------------------------------------------
-revno: 4694
-committer: Venkata Sidagam <venkata.sidagam@oracle.com>
-branch nick: 5.5
-timestamp: Fri 2014-08-01 17:09:55 +0530
-message:
-  Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+
-  
-  Follow-up patch. Removed unwanted code.
-------------------------------------------------------------
-revno: 4693
-committer: Venkata Sidagam <venkata.sidagam@oracle.com>
-branch nick: 5.5
-timestamp: Fri 2014-08-01 14:18:28 +0530
-message:
-  Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+
-  
-  Description: mysql_upgrade fails with below error, 
-  when there are duplicate entries(like 'root'@'LOCALHOST'
-  and 'root'@'localhost') in mysql.user table.
-  ERROR 1062 (23000) at line 1140: Duplicate entry 'localhost-root' for key 'PRIMARY'
-  FATAL ERROR: Upgrade failed
-  
-  Analysis: As part of the bug 12917151 fix we are 
-  making all the hostnames as lower case hostnames.
-  So, this has been done by mysql_upgrade.
-  In case of above mentioned duplicate entries 
-  mysql_upgrade tries to change hostname to lowercase.
-  Since there is already 'root'@'localhost' exists.
-  it is failing with "duplicate entry" error.
-  
-  Fix: Since its a valid error failure. We are 
-  making the error more verbose. So, that user will
-  delete the duplicate errors manually.
-  Along with existing error we are printing below
-  error as well.
-  ERROR 1644 (45000) at line 1153: Multiple accounts exist for @user_name, @host_name that differ only in Host lettercase; remove all except one of them
-------------------------------------------------------------
-revno: 4692 [merge]
-author: 
-committer: Murthy Narkedimilli <murthy.narkedimilli@oracle.com>
-branch nick: mysql-5.5
-timestamp: Thu 2014-07-31 12:30:05 +0200
-message:
-  Merge from mysql-5.5.39-release
-    ------------------------------------------------------------
-    revno: 4676.1.7
-    tags: mysql-5.5.39
-    committer: Ashish Agarwal<ashish.y.agarwal@oracle.com>
-    branch nick: revert_patch
-    timestamp: Sat 2014-07-19 11:24:21 +0530
-    message:
-      WL#7219: Reverting the wl#7219 patch in mysql-5.5.39-release branch 
+This is a first release, this file is supposed to be empty
diff -pruN 5.5.40-1/Docs/INFO_SRC 5.5.42-1/Docs/INFO_SRC
--- 5.5.40-1/Docs/INFO_SRC	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/Docs/INFO_SRC	2015-01-06 20:39:40.000000000 +0000
@@ -1,7 +1,7 @@
-revision-id: murthy.narkedimilli@oracle.com-20140908093355-wke5jqoo1gfo0j93
-date: 2014-09-08 11:33:55 +0200
-build-date: 2014-09-08 11:44:39 +0200
-revno: 4703
-branch-nick: mysql-5.5.40-release
+commit: 5544d6aef981adc4aa85760faa08aaff6d515f03
+date: 2015-01-06 21:23:21 +0100
+build-date: 2015-01-06 21:27:31 +0100
+short: 5544d6a
+branch: mysql-5.5.42-release
 
-MySQL source 5.5.40
+MySQL source 5.5.42
diff -pruN 5.5.40-1/Docs/INSTALL-BINARY 5.5.42-1/Docs/INSTALL-BINARY
--- 5.5.40-1/Docs/INSTALL-BINARY	2014-09-08 09:53:25.000000000 +0000
+++ 5.5.42-1/Docs/INSTALL-BINARY	2015-01-06 20:39:51.000000000 +0000
@@ -1,60 +1,63 @@
-
 2.2 Installing MySQL on Unix/Linux Using Generic Binaries
 
    Oracle provides a set of binary distributions of MySQL. These
-   include binary distributions in the form of compressed tar files
-   (files with a .tar.gz extension) for a number of platforms, as
-   well as binaries in platform-specific package formats for selected
-   platforms.
-
-   This section covers the installation of MySQL from a compressed
-   tar file binary distribution. For other platform-specific package
-   formats, see the other platform-specific sections. For example,
-   for Windows distributions, see Section 2.3, "Installing MySQL on
+   include binary distributions in the form of compressed tar
+   files (files with a .tar.gz extension) for a number of
+   platforms, as well as binaries in platform-specific package
+   formats for selected platforms.
+
+   This section covers the installation of MySQL from a
+   compressed tar file binary distribution. For other
+   platform-specific package formats, see the other
+   platform-specific sections. For example, for Windows
+   distributions, see Section 2.3, "Installing MySQL on
    Microsoft Windows."
 
    To obtain MySQL, see Section 2.1.3, "How to Get MySQL."
 
-   MySQL compressed tar file binary distributions have names of the
-   form mysql-VERSION-OS.tar.gz, where VERSION is a number (for
-   example, 5.5.41), and OS indicates the type of operating system
-   for which the distribution is intended (for example, pc-linux-i686
-   or winx64).
-
-   To install MySQL from a compressed tar file binary distribution,
-   your system must have GNU gunzip to uncompress the distribution
-   and a reasonable tar to unpack it. If your tar program supports
-   the z option, it can both uncompress and unpack the file.
+   MySQL compressed tar file binary distributions have names of
+   the form mysql-VERSION-OS.tar.gz, where VERSION is a number
+   (for example, 5.5.42), and OS indicates the type of operating
+   system for which the distribution is intended (for example,
+   pc-linux-i686 or winx64).
+
+   To install MySQL from a compressed tar file binary
+   distribution, your system must have GNU gunzip to uncompress
+   the distribution and a reasonable tar to unpack it. If your
+   tar program supports the z option, it can both uncompress and
+   unpack the file.
 
    GNU tar is known to work. The standard tar provided with some
-   operating systems is not able to unpack the long file names in the
-   MySQL distribution. You should download and install GNU tar, or if
-   available, use a preinstalled version of GNU tar. Usually this is
-   available as gnutar, gtar, or as tar within a GNU or Free Software
-   directory, such as /usr/sfw/bin or /usr/local/bin. GNU tar is
-   available from http://www.gnu.org/software/tar/.
+   operating systems is not able to unpack the long file names
+   in the MySQL distribution. You should download and install
+   GNU tar, or if available, use a preinstalled version of GNU
+   tar. Usually this is available as gnutar, gtar, or as tar
+   within a GNU or Free Software directory, such as /usr/sfw/bin
+   or /usr/local/bin. GNU tar is available from
+   http://www.gnu.org/software/tar/.
    Warning
 
-   If you have previously installed MySQL using your operating system
-   native package management system, such as yum or apt-get, you may
-   experience problems installing using a native binary. Make sure
-   your previous MySQL previous installation has been removed
-   entirely (using your package management system), and that any
-   additional files, such as old versions of your data files, have
-   also been removed. You should also check the existence of
-   configuration files such as /etc/my.cnf or the /etc/mysql
-   directory have been deleted.
-
-   If you run into problems and need to file a bug report, please use
-   the instructions in Section 1.7, "How to Report Bugs or Problems."
-
-   On Unix, to install a compressed tar file binary distribution,
-   unpack it at the installation location you choose (typically
-   /usr/local/mysql). This creates the directories shown in the
-   following table.
+   If you have previously installed MySQL using your operating
+   system native package management system, such as yum or
+   apt-get, you may experience problems installing using a
+   native binary. Make sure your previous MySQL previous
+   installation has been removed entirely (using your package
+   management system), and that any additional files, such as
+   old versions of your data files, have also been removed. You
+   should also check the existence of configuration files such
+   as /etc/my.cnf or the /etc/mysql directory have been deleted.
+
+   If you run into problems and need to file a bug report,
+   please use the instructions in Section 1.7, "How to Report
+   Bugs or Problems."
+
+   On Unix, to install a compressed tar file binary
+   distribution, unpack it at the installation location you
+   choose (typically /usr/local/mysql). This creates the
+   directories shown in the following table.
 
-   Table 2.3 MySQL Installation Layout for Generic Unix/Linux Binary
-   Package
+   Table 2.3 MySQL Installation Layout for Generic Unix/Linux
+   Binary Package
    Directory Contents of Directory
    bin Client programs and the mysqld server
    data Log files, databases
@@ -67,14 +70,15 @@
    sample configuration files, SQL for database installation
    sql-bench Benchmarks
 
-   Debug versions of the mysqld binary are available as mysqld-debug.
-   To compile your own debug version of MySQL from a source
-   distribution, use the appropriate configuration options to enable
-   debugging support. For more information on compiling from source,
-   see Section 2.9, "Installing MySQL from Source."
+   Debug versions of the mysqld binary are available as
+   mysqld-debug. To compile your own debug version of MySQL from
+   a source distribution, use the appropriate configuration
+   options to enable debugging support. For more information on
+   compiling from source, see Section 2.9, "Installing MySQL
+   from Source."
 
-   To install and use a MySQL binary distribution, the basic command
-   sequence looks like this:
+   To install and use a MySQL binary distribution, the basic
+   command sequence looks like this:
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 shell> cd /usr/local
@@ -96,43 +100,44 @@ shell> cp support-files/mysql.server /et
    installing a binary distribution follows.
    Note
 
-   This procedure assumes that you have root (administrator) access
-   to your system. Alternatively, you can prefix each command using
-   the sudo (Linux) or pfexec (OpenSolaris) command.
-
-   The procedure does not set up any passwords for MySQL accounts.
-   After following the procedure, proceed to Section 2.10.2,
-   "Securing the Initial MySQL Accounts."
+   This procedure assumes that you have root (administrator)
+   access to your system. Alternatively, you can prefix each
+   command using the sudo (Linux) or pfexec (OpenSolaris)
+   command.
+
+   The procedure does not set up any passwords for MySQL
+   accounts. After following the procedure, proceed to Section
+   2.10.2, "Securing the Initial MySQL Accounts."
 
 Create a mysql User and Group
 
-   If your system does not already have a user and group for mysqld
-   to run as, you may need to create one. The following commands add
-   the mysql group and the mysql user. You might want to call the
-   user and group something else instead of mysql. If so, substitute
-   the appropriate name in the following instructions. The syntax for
-   useradd and groupadd may differ slightly on different versions of
-   Unix, or they may have different names such as adduser and
-   addgroup.
+   If your system does not already have a user and group for
+   mysqld to run as, you may need to create one. The following
+   commands add the mysql group and the mysql user. You might
+   want to call the user and group something else instead of
+   mysql. If so, substitute the appropriate name in the
+   following instructions. The syntax for useradd and groupadd
+   may differ slightly on different versions of Unix, or they
+   may have different names such as adduser and addgroup.
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 
    Note
 
    Because the user is required only for ownership purposes, not
-   login purposes, the useradd command uses the -r option to create a
-   user that does not have login permissions to your server host.
-   Omit this option to permit logins for the user (or if your useradd
-   does not support the option).
+   login purposes, the useradd command uses the -r option to
+   create a user that does not have login permissions to your
+   server host. Omit this option to permit logins for the user
+   (or if your useradd does not support the option).
 
 Obtain and Unpack the Distribution
 
-   Pick the directory under which you want to unpack the distribution
-   and change location into it. The example here unpacks the
-   distribution under /usr/local. The instructions, therefore, assume
-   that you have permission to create files and directories in
-   /usr/local. If that directory is protected, you must perform the
-   installation as root.
+   Pick the directory under which you want to unpack the
+   distribution and change location into it. The example here
+   unpacks the distribution under /usr/local. The instructions,
+   therefore, assume that you have permission to create files
+   and directories in /usr/local. If that directory is
+   protected, you must perform the installation as root.
 shell> cd /usr/local
 
    Obtain a distribution file using the instructions in Section
@@ -140,618 +145,1026 @@ shell> cd /usr/local
    distributions for all platforms are built from the same MySQL
    source distribution.
 
-   Unpack the distribution, which creates the installation directory.
-   Then create a symbolic link to that directory. tar can uncompress
-   and unpack the distribution if it has z option support:
+   Unpack the distribution, which creates the installation
+   directory. Then create a symbolic link to that directory. tar
+   can uncompress and unpack the distribution if it has z option
+   support:
 shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
 shell> ln -s full-path-to-mysql-VERSION-OS mysql
 
-   The tar command creates a directory named mysql-VERSION-OS. The ln
-   command makes a symbolic link to that directory. This enables you
-   to refer more easily to the installation directory as
-   /usr/local/mysql.
-
-   If your tar does not have z option support, use gunzip to unpack
-   the distribution and tar to unpack it. Replace the preceding tar
-   command with the following alternative command to uncompress and
-   extract the distribution:
+   The tar command creates a directory named mysql-VERSION-OS.
+   The ln command makes a symbolic link to that directory. This
+   enables you to refer more easily to the installation
+   directory as /usr/local/mysql.
+
+   If your tar does not have z option support, use gunzip to
+   unpack the distribution and tar to unpack it. Replace the
+   preceding tar command with the following alternative command
+   to uncompress and extract the distribution:
 shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
 
 Perform Postinstallation Setup
 
-   The remainder of the installation process involves setting up the
-   configuration file, creating the core databases, and starting the
-   MySQL server. For next steps, see Section 2.10, "Postinstallation
-   Setup and Testing."
+   The remainder of the installation process involves setting up
+   the configuration file, creating the core databases, and
+   starting the MySQL server. For next steps, see Section 2.10,
+   "Postinstallation Setup and Testing."
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.10.2,
-   "Securing the Initial MySQL Accounts."
-
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
 2.3 Installing MySQL on Microsoft Windows
 
+   There are several different methods to install MySQL on
+   Microsoft Windows.
+
+Simple Installation Method
+
+   The simplest and recommended method is to download MySQL
+   Installer (for Windows) and let it install and configure all
+   of the MySQL products on your system. Here is how:
+
+     * Download MySQL Installer from
+       http://dev.mysql.com/downloads/installer/ and execute it.
+       Note
+       Unlike the standard MySQL Installer, the smaller
+       "web-community" version does not bundle any MySQL
+       applications but it will download the MySQL products you
+       choose to install.
+
+     * Choose the appropriate Setup Type for your system.
+       Typically you will choose Developer Default to install
+       MySQL server and other MySQL tools related to MySQL
+       development, helpful tools like MySQL Workbench. Or,
+       choose the Custom setup type to manually select your
+       desired MySQL products.
+       Note
+       Multiple versions of MySQL server can exist on a single
+       system. You can choose one or multiple versions.
+
+     * Complete the installation process by following the MySQL
+       Installation wizard's instructions. This will install
+       several MySQL products and start the MySQL server.
+
+     * MySQL is now installed. You probably configured MySQL as
+       a service that will automatically start MySQL server
+       every time you restart your system.
+
+   Note
+
+   You probably also installed other helpful MySQL products like
+   MySQL Workbench and MySQL Notifier on your system. Consider
+   loading Chapter 26, "MySQL Workbench" to check your new MySQL
+   server connection, and Section 2.3.4, "MySQL Notifier" to
+   view the connection's status. By default, these two programs
+   automatically start after installing MySQL.
+
+   This process also installs the MySQL Installer application on
+   your system, and later you can use MySQL Installer to upgrade
+   or reconfigure your MySQL products.
+
+Additional Installation Information
+
    MySQL is available for Microsoft Windows, for both 32-bit and
-   64-bit versions. For supported Windows platform information, see
-   http://www.mysql.com/support/supportedplatforms/database.html.
+   64-bit versions. For supported Windows platform information,
+   see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
 
    It is possible to run MySQL as a standard application or as a
-   Windows service. By using a service, you can monitor and control
-   the operation of the server through the standard Windows service
-   management tools. For more information, see Section 2.3.7.7,
-   "Starting MySQL as a Windows Service."
-
-   Generally, you should install MySQL on Windows using an account
-   that has administrator rights. Otherwise, you may encounter
-   problems with certain operations such as editing the PATH
-   environment variable or accessing the Service Control Manager.
-   Once installed, MySQL does not need to be executed using a user
-   with Administrator privileges.
+   Windows service. By using a service, you can monitor and
+   control the operation of the server through the standard
+   Windows service management tools. For more information, see
+   Section 2.3.7.7, "Starting MySQL as a Windows Service."
+
+   Generally, you should install MySQL on Windows using an
+   account that has administrator rights. Otherwise, you may
+   encounter problems with certain operations such as editing
+   the PATH environment variable or accessing the Service
+   Control Manager. Once installed, MySQL does not need to be
+   executed using a user with Administrator privileges.
 
    For a list of limitations on the use of MySQL on the Windows
    platform, see Section D.10.6, "Windows Platform Limitations."
 
    In addition to the MySQL Server package, you may need or want
    additional components to use MySQL with your application or
-   development environment. These include, but are not limited to:
+   development environment. These include, but are not limited
+   to:
 
-     * To connect to the MySQL server using ODBC, you must have a
-       Connector/ODBC driver. For more information, including
+     * To connect to the MySQL server using ODBC, you must have
+       a Connector/ODBC driver. For more information, including
        installation and configuration instructions, see MySQL
        Connector/ODBC Developer Guide
        (http://dev.mysql.com/doc/connector-odbc/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/ODBC
+       for you.
 
-     * To use MySQL server with .NET applications, you must have the
-       Connector/Net driver. For more information, including
+     * To use MySQL server with .NET applications, you must have
+       the Connector/Net driver. For more information, including
        installation and configuration instructions, see MySQL
        Connector/Net Developer Guide
        (http://dev.mysql.com/doc/connector-net/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/NET
+       for you.
 
    MySQL distributions for Windows can be downloaded from
-   http://dev.mysql.com/downloads/. See Section 2.1.3, "How to Get
-   MySQL."
+   http://dev.mysql.com/downloads/. See Section 2.1.3, "How to
+   Get MySQL."
 
-   MySQL for Windows is available in several distribution formats,
-   detailed below. Generally speaking, you should use MySQL
-   Installer. It contains more features and MySQL products than the
-   older MSI, is simpler to use than the ZIP file, and you need no
-   additional tools to get MySQL up and running. MySQL Installer
-   automatically installs MySQL Server and additional MySQL products,
-   creates an options file, starts the server, and enables you to
-   create default user accounts. For more information on choosing a
-   package, see Section 2.3.2, "Choosing An Installation Package."
+   MySQL for Windows is available in several distribution
+   formats, detailed below. Generally speaking, you should use
+   MySQL Installer. It contains more features and MySQL products
+   than the older MSI, is simpler to use than the ZIP file, and
+   you need no additional tools to get MySQL up and running.
+   MySQL Installer automatically installs MySQL Server and
+   additional MySQL products, creates an options file, starts
+   the server, and enables you to create default user accounts.
+   For more information on choosing a package, see Section
+   2.3.2, "Choosing An Installation Package."
 
      * Binary installer distributions. There are two different
-       installable distributions that come packaged as a Microsoft
-       Windows Installer (MSI) package that you can install manually
-       or automatically on your systems. The preferred MySQL
-       Installer package includes MySQL Server and additional MySQL
-       products including MySQL Workbench, MySQL Notifier, and MySQL
-       for Excel. MySQL Installer can also be used to upgrade these
-       product in the future. The older MSI package contains all the
-       files you need to install and configure MySQL server, but no
-       additional components.
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
+       installable distributions that come packaged as a
+       Microsoft Windows Installer (MSI) package that you can
+       install manually or automatically on your systems. The
+       preferred MySQL Installer package includes MySQL Server
+       and additional MySQL products including MySQL Workbench,
+       MySQL Notifier, and MySQL for Excel. MySQL Installer can
+       also be used to upgrade these product in the future. The
+       older MSI package contains all the files you need to
+       install and configure MySQL server, but no additional
+       components.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
 
      * The standard binary distribution (packaged as a Zip file)
-       contains all of the necessary files that you unpack into your
-       chosen location. This package contains all of the files in the
-       full Windows MSI Installer package, but does not include an
-       installation program.
-       For instructions on installing MySQL using the Zip file, see
-       Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-       noinstall Zip Archive."
+       contains all of the necessary files that you unpack into
+       your chosen location. This package contains all of the
+       files in the full Windows MSI Installer package, but does
+       not include an installation program.
+       For instructions on installing MySQL using the Zip file,
+       see Section 2.3.7, "Installing MySQL on Microsoft Windows
+       Using a noinstall Zip Archive."
 
      * The source distribution format contains all the code and
-       support files for building the executables using the Visual
-       Studio compiler system.
-       For instructions on building MySQL from source on Windows, see
-       Section 2.9, "Installing MySQL from Source."
+       support files for building the executables using the
+       Visual Studio compiler system.
+       For instructions on building MySQL from source on
+       Windows, see Section 2.9, "Installing MySQL from Source."
 
    MySQL on Windows considerations:
 
      * Large Table Support
-       If you need tables with a size larger than 4GB, install MySQL
-       on an NTFS or newer file system. Do not forget to use MAX_ROWS
-       and AVG_ROW_LENGTH when you create tables. See Section
-       13.1.17, "CREATE TABLE Syntax."
+       If you need tables with a size larger than 4GB, install
+       MySQL on an NTFS or newer file system. Do not forget to
+       use MAX_ROWS and AVG_ROW_LENGTH when you create tables.
+       See Section 13.1.17, "CREATE TABLE Syntax."
 
      * MySQL and Virus Checking Software
-       Virus-scanning software such as Norton/Symantec Anti-Virus on
-       directories containing MySQL data and temporary tables can
-       cause issues, both in terms of the performance of MySQL and
-       the virus-scanning software misidentifying the contents of the
-       files as containing spam. This is due to the fingerprinting
-       mechanism used by the virus-scanning software, and the way in
-       which MySQL rapidly updates different files, which may be
-       identified as a potential security risk.
+       Virus-scanning software such as Norton/Symantec
+       Anti-Virus on directories containing MySQL data and
+       temporary tables can cause issues, both in terms of the
+       performance of MySQL and the virus-scanning software
+       misidentifying the contents of the files as containing
+       spam. This is due to the fingerprinting mechanism used by
+       the virus-scanning software, and the way in which MySQL
+       rapidly updates different files, which may be identified
+       as a potential security risk.
        After installing MySQL Server, it is recommended that you
-       disable virus scanning on the main directory (datadir) used to
-       store your MySQL table data. There is usually a system built
-       into the virus-scanning software to enable specific
-       directories to be ignored.
-       In addition, by default, MySQL creates temporary files in the
-       standard Windows temporary directory. To prevent the temporary
-       files also being scanned, configure a separate temporary
-       directory for MySQL temporary files and add this directory to
-       the virus scanning exclusion list. To do this, add a
-       configuration option for the tmpdir parameter to your my.ini
-       configuration file. For more information, see Section 2.3.7.2,
-       "Creating an Option File."
+       disable virus scanning on the main directory (datadir)
+       used to store your MySQL table data. There is usually a
+       system built into the virus-scanning software to enable
+       specific directories to be ignored.
+       In addition, by default, MySQL creates temporary files in
+       the standard Windows temporary directory. To prevent the
+       temporary files also being scanned, configure a separate
+       temporary directory for MySQL temporary files and add
+       this directory to the virus scanning exclusion list. To
+       do this, add a configuration option for the tmpdir
+       parameter to your my.ini configuration file. For more
+       information, see Section 2.3.7.2, "Creating an Option
+       File."
 
 2.3.1 MySQL Installation Layout on Microsoft Windows
 
-   For MySQL 5.5 on Windows, the default installation directory is
-   C:\Program Files\MySQL\MySQL Server 5.5. Some Windows users prefer
-   to install in C:\mysql, the directory that formerly was used as
-   the default. However, the layout of the subdirectories remains the
-   same.
+   For MySQL 5.5 on Windows, the default installation directory
+   is C:\Program Files\MySQL\MySQL Server 5.5. Some Windows
+   users prefer to install in C:\mysql, the directory that
+   formerly was used as the default. However, the layout of the
+   subdirectories remains the same.
 
-   All of the files are located within this parent directory, using
-   the structure shown in the following table.
+   All of the files are located within this parent directory,
+   using the structure shown in the following table.
 
-   Table 2.4 Default MySQL Installation Layout for Microsoft Windows
+   Table 2.4 Default MySQL Installation Layout for Microsoft
+   Windows
    Directory Contents of Directory Notes
    bin Client programs and the mysqld server
-   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files, databases
-   (Windows XP, Windows Server 2003) The Windows system variable
-   %ALLUSERSPROFILE% defaults to C:\Documents and Settings\All
-   Users\Application Data
-   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases (Vista,
-   Windows 7, Windows Server 2008, and newer) The Windows system
-   variable %PROGRAMDATA% defaults to C:\ProgramData
+   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files,
+   databases (Windows XP, Windows Server 2003) The Windows
+   system variable %ALLUSERSPROFILE% defaults to C:\Documents
+   and Settings\All Users\Application Data
+   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases
+   (Vista, Windows 7, Windows Server 2008, and newer) The
+   Windows system variable %PROGRAMDATA% defaults to
+   C:\ProgramData
    examples Example programs and scripts
    include Include (header) files
    lib Libraries
    scripts Utility scripts
    share Miscellaneous support files, including error messages,
-   character set files, sample configuration files, SQL for database
-   installation
+   character set files, sample configuration files, SQL for
+   database installation
 
-   If you install MySQL using a Windows MSI package, this package
-   creates and sets up the data directory that the installed server
-   will use, but as of MySQL 5.5.5, it also creates a pristine
-   "template" data directory named data under the installation
-   directory. This directory can be useful when the machine will be
-   used to run multiple instances of MySQL: After an installation has
-   been performed using an MSI package, the template data directory
-   can be copied to set up additional MySQL instances. See Section
-   5.3, "Running Multiple MySQL Instances on One Machine."
+   If you install MySQL using a Windows MSI package, this
+   package creates and sets up the data directory that the
+   installed server will use, but as of MySQL 5.5.5, it also
+   creates a pristine "template" data directory named data under
+   the installation directory. This directory can be useful when
+   the machine will be used to run multiple instances of MySQL:
+   After an installation has been performed using an MSI
+   package, the template data directory can be copied to set up
+   additional MySQL instances. See Section 5.3, "Running
+   Multiple MySQL Instances on One Machine."
 
 2.3.2 Choosing An Installation Package
 
-   For MySQL 5.5, there are installation package formats to choose
-   from when installing MySQL on Windows:
+   For MySQL 5.5, there are installation package formats to
+   choose from when installing MySQL on Windows:
    Note
 
-   MySQL Installer and the "Complete Package" methods for installing
-   MySQL are similar, but different. The MySQL Installer is the newer
-   and more advanced option, and it includes all functionality found
-   within the "Complete Package."
+   MySQL Installer and the "Complete Package" methods for
+   installing MySQL are similar, but different. The MySQL
+   Installer is the newer and more advanced option, and it
+   includes all functionality found within the "Complete
+   Package."
 
      * MySQL Installer: This package has a file name similar to
-       mysql-installer-community-5.5.41.0.msi or
-       mysql-installer-commercial-5.5.41.0.msi, and utilizes MSIs to
-       automatically install MySQL server and other products. It will
-       download and apply updates to itself, and for each of the
-       installed products. It also configures the additional
-       non-server products.
-       The installed products are configurable, and this includes:
-       documentation with samples and examples, connectors (such as
-       C, C++, J, NET, and ODBC), MySQL Workbench, MySQL Notifier,
-       MySQL for Excel, and the MySQL Server with its components.
-       MySQL Installer will run on all Windows platforms that are
-       supported by MySQL (see
-       http://www.mysql.com/support/supportedplatforms/database.html)
-       .
+       mysql-installer-community-5.5.42.0.msi or
+       mysql-installer-commercial-5.5.42.0.msi, and utilizes
+       MSIs to automatically install MySQL server and other
+       products. It will download and apply updates to itself,
+       and for each of the installed products. It also
+       configures the additional non-server products.
+       The installed products are configurable, and this
+       includes: documentation with samples and examples,
+       connectors (such as C, C++, J, NET, and ODBC), MySQL
+       Workbench, MySQL Notifier, MySQL for Excel, and the MySQL
+       Server with its components.
+       MySQL Installer will run on all Windows platforms that
+       are supported by MySQL (see
+       http://www.mysql.com/support/supportedplatforms/database.
+       html).
        Note
-       Because MySQL Installer is not a native component of Microsoft
-       Windows and depends on .NET, it will not work on minimal
-       installation options like the "Server Core" version of Windows
-       Server 2008.
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
-
-     * The Complete Package: This package has a file name similar to
-       mysql-5.5.41-win32.msi and contains all files needed for a
-       complete Windows installation, including the Configuration
-       Wizard. This package includes optional components such as the
-       embedded server and benchmark suite.
-
-     * The Noinstall Archive: This package has a file name similar to
-       mysql-5.5.41-win32.zip and contains all the files found in the
-       Complete install package, with the exception of the
-       Configuration Wizard. This package does not include an
-       automated installer, and must be manually installed and
-       configured.
-
-   MySQL Installer is recommended for most users. Both MySQL
-   Installer and the alternative "Complete distribution" versions are
-   available as .msi files for use with installations on Windows. The
-   Noinstall distribution is packaged as a Zip archive. To use a Zip
-   archive, you must have a tool that can unpack .zip files.
-
-   Your choice of install package affects the installation process
-   you must follow. If you choose to install using MySQL Installer,
-   see Section 2.3.3, "Installing MySQL on Microsoft Windows Using
-   MySQL Installer." If you choose to install a standard MSI package,
-   see Section 2.3.5, "Installing MySQL on Microsoft Windows Using an
-   MSI Package." If you choose to install a Noinstall archive, see
-   Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-   noinstall Zip Archive."
+       Because MySQL Installer is not a native component of
+       Microsoft Windows and depends on .NET, it will not work
+       on minimal installation options like the "Server Core"
+       version of Windows Server 2008.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+
+     * The Complete Package: This package has a file name
+       similar to mysql-5.5.42-win32.msi or
+       mysql-5.5.42-winx64.zip, and contains all files needed
+       for a complete Windows installation, including the
+       Configuration Wizard. This package includes optional
+       components such as the embedded server and benchmark
+       suite.
+
+     * The Noinstall Archive: This package has a file name
+       similar to mysql-5.5.42-win32.zip or
+       mysql-5.5.42-winx64.zip, and contains all the files found
+       in the Complete install package, with the exception of
+       the GUI. This package does not include an automated
+       installer, and must be manually installed and configured.
+
+   MySQL Installer is recommended for most users.
+
+   Your choice of install package affects the installation
+   process you must follow. If you choose to use MySQL
+   Installer, see Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer." If you choose to install a
+   standard MSI package, see Section 2.3.5, "Installing MySQL on
+   Microsoft Windows Using an MSI Package." If you choose to
+   install a Noinstall archive, see Section 2.3.7, "Installing
+   MySQL on Microsoft Windows Using a noinstall Zip Archive."
 
 2.3.3 Installing MySQL on Microsoft Windows Using MySQL Installer
 
-   MySQL Installer is an application that simplifies the installation
-   and updating process for a wide range of MySQL products, including
-   MySQL Notifier, MySQL Workbench, and MySQL for Excel
-   (http://dev.mysql.com/doc/mysql-for-excel/en/index.html). From
-   this central application, you can see which MySQL products are
-   already installed, configure them, and update or remove them if
-   necessary. The installer can also install plugins, documentation,
-   tutorials, and example databases. The MySQL Installer is only
-   available for Microsoft Windows, and includes both a GUI and
-   command-line interface.
+   MySQL Installer simplifies the installation and updating
+   process for your MySQL products on Microsoft Windows. From
+   this central application, you can view, remove, update, and
+   reconfigure the existing MySQL products on your system. MySQL
+   Installer can also install plugins, documentation, tutorials,
+   and example databases. The MySQL Installer is only available
+   for Microsoft Windows, and includes both GUI and command-line
+   interfaces.
+
+   The supported products include:
+
+     * MySQL server (http://dev.mysql.com/doc/) (one or multiple
+       versions)
+
+     * MySQL Workbench
+
+     * MySQL Connectors
+       (http://dev.mysql.com/doc/index-connectors.html) (.Net /
+       Python / ODBC / Java / C / C++)
+
+     * MySQL Notifier
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html)
+
+     * MySQL for Visual Studio
+       (http://dev.mysql.com/doc/connector-net/en/connector-net-
+       visual-studio.html)
+
+     * MySQL Utilities and MySQL Fabric
+       (http://dev.mysql.com/doc/index-utils-fabric.html)
+
+     * MySQL Samples and Examples
+
+     * MySQL Documentation
+
+     * MySQL Installer is also installed and remains on the
+       system as its own application
 
 Installer package types
 
 
-     * Full: Bundles all of the MySQL products (including MySQL
-       Server). The file' size is over 160MB, and its name has the
-       form mysql-installer-community-VERSION.N.msi where VERSION is
-       the MySQL Server version number such as 5.6 and N is the
-       package number, which begins at 0.
-
-     * Web: Only contains the Installer and configuration files, and
-       it only downloads the MySQL products you choose to install.
-       The size of this file is about 2MB; the name of the file has
-       the form mysql-installer-community-web-VERSION.N.msi where
-       VERSION is the MySQL Server version number such as 5.6 and N
-       is the package number, which begins at 0.
+     * Full: Bundles all of the MySQL products (including the
+       MySQL server). The file' size is over 200MB, and its name
+       has the form mysql-installer-community-VERSION.N.msi
+       where VERSION is the MySQL Server version number such as
+       5.6 and N is the package number, which begins at 0.
+
+     * Web: Only contains the Installer and configuration files,
+       and it only downloads the MySQL products you choose to
+       install. The size of this file is about 2MB; the name of
+       the file has the form
+       mysql-installer-community-web-VERSION.N.msi where VERSION
+       is the MySQL Server version number such as 5.6 and N is
+       the package number, which begins at 0.
 
 Installer editions
 
 
      * Community edition: Downloadable at
-       http://dev.mysql.com/downloads/installer/. It installs the
-       community edition of all MySQL products.
+       http://dev.mysql.com/downloads/installer/. It installs
+       the community edition of all MySQL products.
 
-     * Commercial edition: Downloadable at either My Oracle Support
-       (https://support.oracle.com/) (MOS) or
+     * Commercial edition: Downloadable at either My Oracle
+       Support (https://support.oracle.com/) (MOS) or
        https://edelivery.oracle.com/. It installs the commercial
-       version of all MySQL products, including Workbench SE. It also
-       integrates with your MOS account, so enter in your MOS
-       credentials to automatically receive updates for your
-       commercial MySQL products.
+       version of all MySQL products, including Workbench SE/EE.
+       It also integrates with your MOS account.
+       Note
+       Entering your MOS credentials is optional when installing
+       bundled MySQL products, but your credentials are required
+       when choosing non-bundled MySQL products that MySQL
+       Installer must download.
 
    For notes detailing the changes in each release of MySQL
    Installer, see MySQL Installer Release Notes
    (http://dev.mysql.com/doc/relnotes/mysql-installer/en/).
 
-   MySQL Installer is compatible with pre-existing installations, and
-   adds them to its list of installed components. While the MySQL
-   Installer is bundled with a specific version of MySQL Server, a
-   single MySQL Installer instance can install and manage multiple
-   MySQL Server versions. For example, a single MySQL Installer
-   instance can install versions 5.1, 5.5, and 5.6. It can also
-   manage either commercial or community editions of the MySQL
-   Server.
-   Note
-
-   A single host can not have both community and commercial editions
-   of MySQL Server installed. For example, if you want both MySQL
-   Server 5.5 and 5.6 installed on a single host, then both must be
-   the same commercial or community edition.
-
-   MySQL Installer handles the initial configuration and setup of the
-   applications. For example:
-
-    1. It will create MySQL Server connections in MySQL Workbench.
-
-    2. It creates the configuration file (my.ini) that is used to
-       configure the MySQL Server. The values written to this file
-       are influenced by choices you make during the installation
-       process.
-
-    3. It imports example databases.
-
-    4. It creates MySQL Server user accounts with configurable
-       permissions based on general roles, such as DB Administrator,
-       DB Designer, and Backup Admin. It optionally creates a Windows
-       user named MysqlSys with limited privileges, which would then
-       run the MySQL Server.
-       This feature is only available during the initial installation
-       of the MySQL Server, and not during future updates. User
-       accounts may also be added with MySQL Workbench.
-
-    5. If the "Advanced Configuration" option is checked, then the
-       Logging Options are also configured. This includes defining
-       file paths for the error log, general log, slow query log
-       (including the configuration of seconds it requires to execute
-       a query), and the binary log.
+   MySQL Installer is compatible with pre-existing
+   installations, and adds them to its list of installed
+   components. While the standard MySQL Installer is bundled
+   with a specific version of MySQL Server, a single MySQL
+   Installer instance can install and manage multiple MySQL
+   Server versions. For example, a single MySQL Installer
+   instance can install (and update) versions 5.5, 5.6, and 5.7
+   on the host.
+   Note
+
+   A single host can not have both community and commercial
+   editions of MySQL Server installed. For example, if you want
+   both MySQL Server 5.5 and 5.6 installed on a single host,
+   then both must be the same edition.
+
+   MySQL Installer handles the initial configuration and set up
+   of the applications. For example:
+
+    1. It creates initial MySQL Server connections in MySQL
+       Workbench.
+
+    2. It creates the configuration file (my.ini) that is used
+       to configure the MySQL Server. The values written to this
+       file are influenced by choices you make during the
+       installation process.
+
+    3. It can optionally import example databases.
+
+    4. It can optionally create MySQL Server user accounts with
+       configurable permissions based on general roles, such as
+       DB Administrator, DB Designer, and Backup Admin. It
+       optionally creates a Windows user named MysqlSys with
+       limited privileges, which would then run the MySQL
+       Server.
+       User accounts may also be added and configured in MySQL
+       Workbench.
+
+    5. If the "Advanced Configuration" option is checked, then
+       the Logging Options are also configured. This includes
+       defining file paths for the error log, general log, slow
+       query log (including the configuration of seconds it
+       requires to execute a query), and the binary log.
 
-   MySQL Installer can optionally check for updated components and
-   download them for you automatically.
+   MySQL Installer can optionally check for updated components
+   and download them for you.
 
 2.3.3.1 MySQL Installer GUI
 
-   After installation of the GUI version, the installer will have add
-   its own Start Menu item under MySQL.
+   Installing MySQL Installer adds a link to the Start menu
+   under the MySQL group. Click Start, All Programs MySQL, MySQL
+   Installer to reload the MySQL Installer GUI.
+   Note
+
+   Files that are generated by MySQL Installer grant full
+   permissions to the user that executes MySQL Installer,
+   including my.ini. This does not apply to files and
+   directories for specific products such as the MySQL Server
+   data directory in %ProgramData% that is owned by SYSTEM.
+
+   The initial execution of MySQL Installer requires you to
+   accept the license agreement before installing MySQL
+   products.
+
+   Figure 2.7 MySQL Installer - License Agreement
+   MySQL Installer - License Agreement
+
+Installing New Packages
+
+   Choose the appropriate Setup Type for your system. The
+   selected type determines which MySQL products are installed
+   on your system, or select Custom to manually choose
+   individual products.
+
+     * Developer: Install all products needed to develop
+       applications with MySQL. This is the default option.
+
+     * Server only: Only install the MySQL server.
+
+     * Client only: Only install the MySQL client products,
+       which does not include the MySQL server.
+
+     * Full: Install all MySQL products.
+
+     * Custom: Manually select the MySQL products to install.
+       Note
+       After the initial installation, you may use MySQL
+       Installer to manually select MySQL products to install or
+       remove. In other words, MySQL Installer becomes a MySQL
+       product management system.
+
+   Figure 2.8 MySQL Installer - Choosing a Setup Type
+   MySQL Installer - Choosing a Setup Type
+
+   After you select a setup type, the MySQL Installer will check
+   your system for the necessary external requirements for each
+   of the selected MySQL products. MySQL Installer will either
+   download and install the missing components onto your system,
+   or point you to the download location and set Status to
+   "Manual".
+
+   The next window lists the MySQL products that are scheduled
+   to be installed:
+
+   Figure 2.9 MySQL Installer - Installation Progress
+   MySQL Installer - Installation Progress
+
+   As components are installed, their Status changes from a
+   progress percentage to "Complete".
+
+   After all components are installed, the next step configures
+   some of the recently installed MySQL products. The
+   Configuration Overview window displays the progress and then
+   loads a configuration window, if required. Our example
+   configures MySQL Server 5.6.x.
+
+Configuring MySQL Server
+
+   Configuring the MySQL server begins with defining several
+   Type and Networking options.
+
+   Figure 2.10 MySQL Installer - Configuration Overview
+   MySQL Installer - Configuration Overview
+
+   Server Configuration Type
+
+   Choose the MySQL server configuration type that describes
+   your setup. This setting defines the amount of system
+   resources that will be assigned to your MySQL server
+   instance.
+
+     * Developer: A machine that will host many other
+       applications, and typically this is your personal
+       workstation. This option configures MySQL to use the
+       least amount of memory.
+
+     * Server: Several other applications will be running on
+       this machine, such as a web server. This option
+       configures MySQL to use a medium amount of memory.
+
+     * Dedicated: A machine that is dedicated to running the
+       MySQL server. Because no other major applications are
+       running on the server, such as web servers, this option
+       configures MySQL to use all available memory.
+
+   Connectivity
+
+   Connectivity options control how you will connect to MySQL.
+   Options include:
+
+     * TCP/IP: You may enable TCP/IP Networking here as
+       otherwise only localhost connections are allowed. Also
+       define the Port Number and whether to open the firewall
+       port for network access.
+
+     * Named Pipe: Enable and define the pipe name, similar to
+       using the --enable-named-pipe option.
+
+     * Shared Memory: Enable and then define the memory name,
+       similar to using the --shared-memory option.
+
+   Advanced Configuration
+
+   Checking the "Advanced Configuration" option provides
+   additional Logging Options to configure. This includes
+   defining file paths for the error log, general log, slow
+   query log (including the configuration of seconds it requires
+   to execute a query), and the binary log.
+
+   Figure 2.11 MySQL Installer - MySQL Server Configuration:
+   Type and Networking
+   MySQL Installer- MySQL Server Configuration: Type and
+   Networking
+
+Accounts and Roles
+
+   Next, define your MySQL account information. Assigning a root
+   password is required.
+
+   Optionally, you can add additional MySQL user accounts with
+   predefined user roles. Each predefined role, such as "DB
+   Admin", are configured with their own set of privileges. For
+   example, the "DB Admin" role has more privileges than the "DB
+   Designer" role. Click the Role dropdown for a list of role
+   descriptions.
    Note
 
-   Files that are generated by MySQL Installer grant full permissions
-   to the user that executes MySQL Installer, including my.ini. This
-   does not apply to files and directories for specific products such
-   as the MySQL Server data directory in ProgramData, that is owned
-   by SYSTEM.
+   If the MySQL Server is already installed, then you must also
+   enter the Current Root Password.
 
-   After the installer itself has been installed and started, the
-   following screen is displayed:
+   Figure 2.12 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles
 
-   Figure 2.7 MySQL Installer - Welcome Screen
-   MySQL Installer - Welcome Screen
+   Figure 2.13 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles: Adding a User
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles: Adding a User
 
-   There are three main options:
+Windows Service
 
-    1. Install MySQL Products - The Installation Wizard.
+   Next, configure the Windows Service details. This includes
+   the service name, whether the MySQL Server should be loaded
+   at startup, and how the Windows Service for MySQL Server is
+   executed.
 
-    2. About MySQL - Learn about MySQL products and features.
+   Figure 2.14 MySQL Installer - MySQL Server Configuration:
+   Windows Service
+   MySQL Installer - MySQL Server Configuration: Windows Service
+   Note
 
-    3. Resources - Information to help install and configure MySQL.
+   When configuring Run Windows Services as ... using a Custom
+   User, the custom user must have privileges to log on to
+   Microsoft Windows as a service. And the Next button will be
+   disabled until this user is configured with these user
+   rights.
 
-   To Install MySQL Products after executing MySQL Installer for the
-   first time, you must accept the license agreement before
-   proceeding with the installation process.
+   On Microsoft Windows 7, this is configured by loading the
+   Start Menu, Control Panel, Administrative Tools, Local
+   Security Policy, Local Policies, User Rights Assignment, then
+   Log On As A Service. Choose Add User or Group here to add the
+   custom user, and then OK, OK to save.
 
-   Figure 2.8 MySQL Installer - License Agreement
-   MySQL Installer - License Agreement
+Advanced Options
 
-   If you are connected to the Internet, then the Installer will
-   search for the latest MySQL components and add them to the
-   installation bundle. Click Connect to the Internet to complete
-   this step, or otherwise check the Skip checkbox and then Continue.
-
-   Figure 2.9 MySQL Installer - Find latest products
-   MySQL Installer - Find latest products
-
-   If you chose "Connect to the Internet," the next page will show
-   the progress of MySQL Installer's search for available updates.
-   When the search is complete (or if you opted to skip the search),
-   you will be taken to the Choose Setup Type page:
+   The next configuration step is available if the Advanced
+   Configuration option was checked. This section includes
+   options that are related to the MySQL log files:
 
-   Figure 2.10 MySQL Installer - Choosing a Setup Type
-   MySQL Installer - Choosing a Setup Type
+   Figure 2.15 MySQL Installer - MySQL Server Configuration:
+   Logging Options
+   MySQL Installer - MySQL Server Configuration: Logging Options
 
-   Determine the option most compatible with your preferences by
-   reading the Setup Type Description descriptions.
+   Click Next to continue on to the final page before all of the
+   requested changes are applied. This Apply Server
+   Configuration page details the configuration steps that will
+   be performed.
 
-   The Installation and Data paths are also defined here, and a
-   caution flag will notify you if the data path you define already
-   exists.
+   Figure 2.16 MySQL Installer - MySQL Server Configuration:
+   Apply Server Configuration
+   MySQL Installer - MySQL Server Configuration: Apply Server
+   Configuration
 
-   After you select a setup type, the MySQL Installer will check your
-   system for the necessary external requirements and download then
-   install missing components onto your system.
+   Click Execute to execute the configuration steps. The icon
+   for each step toggles from white to green on success, or the
+   process stops on failure. Click the Log tab to view the log.
 
-   Figure 2.11 MySQL Installer - Check Requirements
-   MySQL Installer - Check Requirements
+   After the MySQL Installer configuration process is finished,
+   MySQL Installer reloads the opening page where you can
+   execute other installation and configuration related actions.
 
-   The next window lists the MySQL products that are scheduled to be
-   installed:
+   MySQL Installer is added to the Microsoft Windows Start menu
+   under the MySQL group. Opening MySQL Installer loads its
+   dashboard where installed MySQL products are listed, and
+   other MySQL Installer actions are available:
 
-   Figure 2.12 MySQL Installer - Installation Progress
-   MySQL Installer - Installation Progress
+   Figure 2.17 MySQL Installer - Main Dashboard
+   MySQL Installer - Main Dashboard
 
-   As components are installed, you'll see their status change from
-   "to be installed" to "install success."
+Adding MySQL Products
 
-   Figure 2.13 MySQL Installer - Installation Progress status
-   MySQL Installer - Installation Progress status
+   Click Add to add new products. This loads the Select Products
+   and Features page:
 
-   After all components are installed, the next step involves
-   configuring the products. The Configuration Overview window
-   displays the progress and then loads a configuration window if it
-   is required.
+   Figure 2.18 MySQL Installer - Select Products and Features
+   MySQL Installer - Select Products and Features
 
-   Figure 2.14 MySQL Installer - Configuration Overview
-   MySQL Installer - Configuration Overview
+   From here, choose the MySQL products you want to install from
+   the left Available Products pane, and then click the green
+   right arrow to queue products for installation.
+
+   Optionally, click Edit to open the product and features
+   search filter:
 
-   The ideal MySQL Server configuration depends on your intended use,
-   as explained in the next window. Choose the description that most
-   closely applies to your machine.
+   Figure 2.19 MySQL Installer - Select Products and Features
+   Filter
+   MySQL Installer - Select Products and Features Filter
 
-   You may enable TCP/IP Networking here as otherwise only localhost
-   connections are allowed.
+   For example, you might choose to include Pre-Release products
+   in your selections, such as a Beta product that has not yet
+   reached GA status.
+   Note
 
-   Checking the "Advanced Configuration" option provides additional
-   Logging Options to configure. This includes defining file paths
-   for the error log, general log, slow query log (including the
-   configuration of seconds it requires to execute a query), and the
-   binary log.
+   The ability to install Pre-Release versions of MySQL products
+   was added in MySQL Installer 1.4.0.
 
-   Figure 2.15 MySQL Installer - MySQL Server Configuration: Define
-   platform, networking, and logging options
-   MySQL Installer- MySQL Server Configuration: Define platform,
-   networking, and logging options
+   Select all of the MySQL products you want to install, then
+   click Next to continue, and then Execute to execute the
+   installation process to install all of the selected products.
 
-   Next, choose your account information. Defining a root password is
-   required, whereas it's optional to create additional users. There
-   are several different predefined user roles that each have
-   different permission levels. For example, a "DB Admin" will have
-   more privileges than a "DB Designer.".
+2.3.3.1.1 MySQL Product Catalog
 
-   Figure 2.16 MySQL Installer - MySQL Server Configuration: User
-   accounts
-   MySQL Installer - MySQL Server Configuration: User accounts
+   MySQL Installer stores a MySQL product catalog. The catalog
+   can be updated either manually or automatically, and the
+   catalog change history is also available.
    Note
 
-   If the MySQL Server is already installed, then the Current Root
-   Password will also be needed.
+   The MySQL product catalog was added in MySQL Installer 1.4.0.
+
+   Manual updates
+
+   You can update the MySQL product catalog at any time by
+   clicking Catalog on the Installer dashboard.
+
+   Figure 2.20 MySQL Installer - Open the MySQL Product Catalog
+   MySQL Installer - Open the MySQL Product Catalog
+
+   From there, click Execute to update the product catalog.
+
+   Automatic updates
+
+   You can configure MySQL Installer to automatically update the
+   MySQL product catalog once per day. To enable this feature
+   and set the update time, click the wrench icon on the
+   Installer dashboard.
 
-   Next, configure the Windows Service Details. This includes the
-   service name, how the MySQL Server should be loaded at startup,
-   and how the Windows Service for MySQL Server will be run.
+   The next window configures the Automatic Catalog Update.
+   Enable or disable this feature, and also set the hour.
 
-   Figure 2.17 MySQL Installer - MySQL Server Configuration: Windows
-   service details
-   MySQL Installer - MySQL Server Configuration: Windows service
-   details
+   Figure 2.21 MySQL Installer - Configure the Catalog Scheduler
+   MySQL Installer - Configure the Catalog Scheduler
+
+   This option uses the Windows Task Scheduler to schedule a
+   task named "ManifestUpdate".
+
+   Change History
+
+   MySQL Installer tracks the change history for all of the
+   MySQL products. Click Catalog from the dashboard, optionally
+   update the catalog (or, toggle the Do not update at this time
+   checkbox), click Next/Execute, and then view the change
+   history.
+
+   Figure 2.22 MySQL Installer - Catalog Change History
+   MySQL Installer - Catalog Change History
+
+2.3.3.1.2 Remove MySQL Products
+
+   MySQL Installer can also remove MySQL products from your
+   system. To remove a MySQL product, click Remove from the
+   Installer dashboard. This opens a window with a list of
+   installed MySQL products. Select the MySQL products you want
+   to remove (uninstall), and then click Execute to begin the
+   removal process.
    Note
 
-   When configuring Run Windows Services as ... using a Custom User,
-   the custom user must have privileges to log on to Windows as a
-   service. And the Next button will be disabled until this user is
-   given these user rights.
+   To select all MySQL products, click the [ ] checkbox to the
+   left of the Product label.
 
-   On Microsoft Windows 7, this is configured by loading the Start
-   Menu, Control Panel, Administrative Tools, Local Security Policy,
-   Local Policies, User Rights Assignment, then Log On As A Service.
-   Choose Add User or Group here to add the custom user, and then OK,
-   OK to save.
+   Figure 2.23 MySQL Installer - Removing Products: Select
+   MySQL Installer - Removing Products: Select
 
-   The final configuration step is available if the Advanced
-   Configuration option was checked, and it includes configuration
-   options related to log file names:
+   Figure 2.24 MySQL Installer - Removing Products: Executed
+   MySQL Installer - Removing Products: Executed
 
-   Figure 2.18 MySQL Installer - MySQL Server Configuration: Logging
-   options
-   MySQL Installer - MySQL Server Configuration: Logging options
+2.3.3.1.3 Alter MySQL Products
 
-   After the MySQL Installer configuration process is completed, you
-   may save the installation log, and then load MySQL Workbench if
-   the Start MySQL Workbench after Setup option is checked:
+   MySQL Installer offers several options to alter your MySQL
+   product installations.
 
-   Figure 2.19 MySQL Installer - Installation Complete
-   MySQL Installer - Installation Complete
+Upgrade
 
-   You can now open MySQL Installer from the Microsoft Windows Start
-   menu under the MySQL group, which will load the MySQL Installer
-   Maintenance Screen. This is used to add, update, and remove
-   features.
+   MySQL products with an available upgrade are highlighted on
+   the main dashboard. Products with available upgrades will
+   have an upgrade icon next to their version number.
 
-   Figure 2.20 MySQL Installer - Maintenance Screen
-   MySQL Installer - Maintenance Screen
+   Figure 2.25 MySQL Installer - Upgrade a MySQL Product
+   MySQL Installer - Upgrade a MySQL Product
    Note
 
-   An Update Screen screen is shown if MySQL Installer is used on a
-   machine with older products installed, as opposed to the
-   Maintenance Screen shown above. However, the functionality remains
-   the same.
+   Available upgrades are determined by having a current
+   catalog. For information about keeping your MySQL product
+   catalog current, see Section 2.3.3.1.1, "MySQL Product
+   Catalog."
+
+   Click Upgrade to view a list upgradable products. Our example
+   indicates that MySQL server 5.6.19 can be upgraded to version
+   5.6.20.
+
+   Figure 2.26 MySQL Installer - Select Products To Upgrade
+   MySQL Installer - Select Products To Upgrade
+
+   Select (check) the products to upgrade, and optionally click
+   the changes link to view the product's release notes in your
+   browser. Click Next to begin the upgrade process.
+
+   Figure 2.27 MySQL Installer - Apply Updates
+   MySQL Installer - Apply Updates
+
+   A MySQL server upgrade will also check and upgrade the
+   server's database. Although optional, this step is
+   recommended.
 
-   Add/Modify Products and Features will list all installed and
-   available MySQL products.
+   Figure 2.28 MySQL Installer - Check and Upgrade Database
+   MySQL Installer - Check and Upgrade Database
 
-   Figure 2.21 MySQL Installer - Add/Modify Products and Features
-   MySQL Installer - Add/Modify Products and Features
+   Upon completion, your upgraded products will be upgraded and
+   available to use. A MySQL server upgrade also restarts the
+   MySQL server.
+
+Reconfigure
+
+   Some MySQL products, such as the MySQL server, include a
+   Reconfigure option. It opens the same configuration options
+   that were set when the MySQL product was installed, and is
+   pre-populated with the current values.
+
+   To execute, click the Reconfigure link under the Quick Action
+   column on the main dashboard for the MySQL product that you
+   want to reconfigure.
+
+   Figure 2.29 MySQL Installer - Reconfigure a MySQL Product
+   MySQL Installer - Reconfigure a MySQL Product
+
+   In the case of the MySQL server, this opens the familiar
+   configuration wizard.
+
+   Figure 2.30 MySQL Installer - Reconfiguration Wizard
+   MySQL Installer - Reconfiguration Wizard
+
+Modify
 
-   The installation is now complete. MySQL Server should be running,
-   and most MySQL products installed and available for use.
+   Many MySQL products contain feature components that can be
+   added or removed. For example, Debug binaries and Client
+   Programs are subcomponents of the MySQL server.
 
-   See also the MySQL Workbench documentation
-   (http://dev.mysql.com/doc/workbench/en/).
+   The modify the features of a product, click Modify on the
+   main dashboard.
+
+   Figure 2.31 MySQL Installer - Modify Product Features
+   MySQL Installer - Modify Product Features
+
+   Click Execute to execute the modification request.
 
 2.3.3.2 MySQL Installer Console
 
-   MySQLInstallerConsole provides functionality similar to the GUI
-   version of MySQL Installer, but from the command-line. It is
-   installed when MySQL Installer is initially executed, and then
-   available within the MySQL Installer directory. Typically that is
-   in C:\Program Files (x86)\MySQL\MySQL Installer\, and the console
-   must be executed with administrative privileges.
-
-   To use, invoke the Command Prompt with administrative privileges
-   by choosing Start, Accessories, then right-click on Command Prompt
-   and choose Run as administrator. And from the command-line,
-   optionally change the directory to where MySQLInstallerConsole is
-   located:
+   MySQLInstallerConsole provides functionality similar to the
+   GUI version of MySQL Installer, but from the command-line. It
+   is installed when MySQL Installer is initially executed, and
+   then available within the MySQL Installer directory.
+   Typically that is in C:\Program Files (x86)\MySQL\MySQL
+   Installer\, and the console must be executed with
+   administrative privileges.
+
+   To use, invoke the Command Prompt with administrative
+   privileges by choosing Start, Accessories, then right-click
+   on Command Prompt and choose Run as administrator. And from
+   the command-line, optionally change the directory to where
+   MySQLInstallerConsole is located:
 C:\> cd "C:\Program Files (x86)\MySQL\MySQL Installer"
+C:\> MySQLInstallerConsole.exe help
 
-   MySQLInstallerConsole supports the following options, which are
-   specified on the command line:
+C:\Program Files (x86)\MySQL\MySQL Installer for Windows>MySQLInstalle
+rConsole.exe help
 
-     * --help, -h, or -?
-       Displays a help message with usage examples, and then exits.
-C:\> MySQLInstallerConsole --help
-
-     * --updates (or -u)
-       Checks for new products before any further action is taken.
-       Disabled by default.
-
-     * --nowait
-       Skips the final pause when the program finishes. Otherwise, a
-       "Press Enter to continue." dialogue is generated. It is used
-       in conjunction with other options.
-
-     * --catalog=catalog_name (or -c)
-       Sets the default catalog. Use --list to view a list of
-       available catalogs.
-
-     * --type=installation_type (or -t)
-       Sets the installation type.
-       The possible values for installation_type are: developer,
-       server, client, full, and custom.
-
-     * --action=action_name
-       The action being performed.
-       The possible values are: install, remove, upgrade, list, and
-       status.
-
-          + install: Installs a product or products, as defined by
-            --products
-
-          + upgrade: Upgrades a product or products, as defined by
-            --products.
-
-          + remove: Removes a product or products, as defined by
-            --products.
-
-          + list: Lists the product manifest, both installed and
-            available products.
-
-          + status: Shows the status after another action is
-            performed.
-
-     * --product=product_name[:feature1],[feature2], [...] (or -p)
-       Set the feature list of a product. Use --list to view
-       available products, or pass in --product=* (an asterisk) to
-       install all available products.
-
-     * --config=product_name:passwd=root_password[;parameter1=value],
-       [;parameter2=value], ...
-       The configuration parameters for the most recently listed
-       products.
+The following commands are available:
 
-     * --user=product_name:name=username,host:hostname,role=rolename,
-       password=password or
-       --user=product_name:name=username,host:hostname,role=rolename,
-       tokens=tokens
-       Creates a new user.
-       Requires: name, host, role, and the password or tokens. Tokens
-       are separated by pipe ("|") characters.
+Configure - Configures one or more of your installed programs.
+Help      - Provides list of available commands.
+Install   - Install and configure one or more available MySQL programs
+.
+List      - Provides an interactive way to list all products available
+.
+Modify    - Modifies the features of installed products.
+Remove    - Removes one or more products from your system.
+Status    - Shows the status of all installed products.
+Update    - Update the current product catalog.
+Upgrade   - Upgrades one or more of your installed programs.
+
+   MySQLInstallerConsole supports the following options, which
+   are specified on the command line:
+
+     * configure [product1]:[setting]=[value];
+       [product2]:[setting]=[value]; [...]
+       Configure one or more MySQL products on your system.
+       Switches include:
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole configure -showsettings server
+C:\> MySQLInstallerConsole configure server:port=3307
+
+
+     * help [command]
+       Displays a help message with usage examples, and then
+       exits. Pass in an additional command to receive help
+       specific to that command.
+C:\> MySQLInstallerConsole help
+C:\> MySQLInstallerConsole help install
+
+
+     * install [product]:[features]:[config block]:[config
+       block]:[config block]; [...]
+       Install one or more MySQL products on your system.
+       Switches and syntax options include:
+
+          + -type=[SetupType] : Installs a predefined set of
+            software. The "SetupType" can be one of the
+            following:
+            Note
+            Non-custom setup types can only be chosen if no
+            other MySQL products are installed.
+               o Developer: Installs a complete development
+                 environment.
+               o Server: Installs a single MySQL server
+               o Client: Installs client programs and libraries
+               o Full: Installs everything
+               o Custom: Installs user selected products. This
+                 is the default option.
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+
+          + [config block]: One or more configuration blocks can
+            be specified. Each configuration block is a
+            semicolon separated list of key value pairs. A block
+            can include either a "config" or "user" type key,
+            where "config" is the default type if one is not
+            defined.
+            Only one "config" type block can be defined per
+            product. A "user" block should be defined for each
+            user that should be created during the product's
+            installation.
+            Note
+            Adding users is not supported when a product is
+            being reconfigured.
+
+          + [feature]: The feature block is a semicolon
+            separated list of features, or '*' to select all
+            features.
+C:\> MySQLInstallerConsole install server;5.6.22:*:port=3307;serverid=
+2:type=user;username=foo;password=bar;role=DBManager
+C:\> MySQLInstallerConsole install server;5.6.22;x64 -silent
+
+
+     * list
+       Lists an interactive console where all of the available
+       MySQL products can be searched. Execute
+       MySQLInstallerConsole list to launch the console, and
+       enter in a substring to search.
+C:\> MySQLInstallerConsole list
+
+
+     * modify [product1:-removelist|+addlist]
+       [product2:-removelist|+addlist] [...]
+       Modifies or displays features of a previously installed
+       MySQL product.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole modify server
+C:\> MySQLInstallerConsole modify server:+documentation
+C:\> MySQLInstallerConsole modify server:-debug
+
+
+     * remove [product1] [product2] [...]
+       Removes one ore more products from your system.
+
+          + * : Pass in * to remove all of the MySQL products.
+
+          + -continue : Continue the operation even if an error
+            occurs.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole remove *
+C:\> MySQLInstallerConsole remove server
+
+
+     * status
+       Provides a quick overview of the MySQL products that are
+       installed on the system. Information includes product
+       name and version, architecture, date installed, and
+       install location.
+C:\> MySQLInstallerConsole status
+
+
+     * upgrade [product1:version] [product2:version], [...]
+       Upgrades one or more products on your system. Syntax
+       options include:
+
+          + * : Pass in * to upgrade all products to the latest
+            version, or pass in specific products.
+
+          + ! : Pass in ! as a version number to upgrade the
+            MySQL product to its latest version.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole upgrade *
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2
+C:\> MySQLInstallerConsole upgrade workbench:!
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2 excel:1.3.2
+
+
+     * update
+       Downloads the latest MySQL product catalog to your
+       system. On success, the download catalog will be applied
+       the next time either MySQLInstaller or
+       MySQLInstallerConsole is executed.
+C:\> MySQLInstallerConsole update
+
+       Note
+       The Automatic Catalog Update GUI option executes this
+       command from the Windows Task Scheduler.
 
 2.3.4 MySQL Notifier
 
    The MySQL Notifier is a tool that enables you to monitor and
-   adjust the status of your local and remote MySQL Server instances
-   through an indicator that resides in the system tray. The MySQL
-   Notifier also gives quick access to several MySQL GUI tools (such
-   as MySQL Workbench) through its context menu.
+   adjust the status of your local and remote MySQL Server
+   instances through an indicator that resides in the system
+   tray. The MySQL Notifier also gives quick access to several
+   MySQL GUI tools (such as MySQL Workbench) through its context
+   menu.
 
    The MySQL Notifier is installed by MySQL Installer, and (by
    default) will start-up when Microsoft Windows is started.
    Note
 
    To install, download and execute the MySQL Installer
-   (http://dev.mysql.com/downloads/installer/), be sure the MySQL
-   Notifier product is selected, then proceed with the installation.
-   See the MySQL Installer manual for additional details.
+   (http://dev.mysql.com/downloads/installer/), be sure the
+   MySQL Notifier product is selected, then proceed with the
+   installation. See the MySQL Installer manual for additional
+   details.
 
-   For notes detailing the changes in each release of MySQL Notifier,
-   see the MySQL Notifier Release Notes
+   For notes detailing the changes in each release of MySQL
+   Notifier, see the MySQL Notifier Release Notes
    (http://dev.mysql.com/doc/relnotes/mysql-notifier/en/).
 
    Visit the MySQL Notifier forum
@@ -762,15 +1175,16 @@ C:\> MySQLInstallerConsole --help
 
      * Start, Stop, and Restart instances of the MySQL Server.
 
-     * Automatically detects (and adds) new MySQL Server services.
-       These are listed under Manage Monitored Items, and may also be
-       configured.
-
-     * The Tray icon changes, depending on the status. It's green if
-       all monitored MySQL Server instances are running, or red if at
-       least one service is stopped. The Update MySQL Notifier tray
-       icon based on service status option, which dictates this
-       behavior, is enabled by default for each service.
+     * Automatically detects (and adds) new MySQL Server
+       services. These are listed under Manage Monitored Items,
+       and may also be configured.
+
+     * The Tray icon changes, depending on the status. It's
+       green if all monitored MySQL Server instances are
+       running, or red if at least one service is stopped. The
+       Update MySQL Notifier tray icon based on service status
+       option, which dictates this behavior, is enabled by
+       default for each service.
 
      * Links to other applications like MySQL Workbench, MySQL
        Installer, and the MySQL Utilities. For example, choosing
@@ -778,8 +1192,8 @@ C:\> MySQLInstallerConsole --help
        Administration window for that particular instance.
 
      * If MySQL Workbench is also installed, then the Configure
-       Instance and SQL Editor options are available for local (but
-       not remote) MySQL instances.
+       Instance and SQL Editor options are available for local
+       (but not remote) MySQL instances.
 
      * Monitoring of both local and remote MySQL instances.
 
@@ -787,108 +1201,112 @@ C:\> MySQLInstallerConsole --help
 
    Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   The MySQL Notifier resides in the system tray and provides visual
-   status information for your MySQL Server instances. A green icon
-   is displayed at the top left corner of the tray icon if the
-   current MySQL Server is running, or a red icon if the service is
-   stopped.
-
-   The MySQL Notifier automatically adds discovered MySQL Services on
-   the local machine, and each service is saved and configurable. By
-   default, the Automatically add new services whose name contains
-   option is enabled and set to mysql. Related Notifications Options
-   include being notified when new services are either discovered or
-   experience status changes, and are also enabled by default. And
-   uninstalling a service will also remove the service from the MySQL
-   Notifier.
+   The MySQL Notifier resides in the system tray and provides
+   visual status information for your MySQL Server instances. A
+   green icon is displayed at the top left corner of the tray
+   icon if the current MySQL Server is running, or a red icon if
+   the service is stopped.
+
+   The MySQL Notifier automatically adds discovered MySQL
+   Services on the local machine, and each service is saved and
+   configurable. By default, the Automatically add new services
+   whose name contains option is enabled and set to mysql.
+   Related Notifications Options include being notified when new
+   services are either discovered or experience status changes,
+   and are also enabled by default. And uninstalling a service
+   will also remove the service from the MySQL Notifier.
    Note
 
    The Automatically add new services whose name contains option
-   default changed from ".*mysqld.*" to "mysql" in Notifier 1.1.0.
+   default changed from ".*mysqld.*" to "mysql" in Notifier
+   1.1.0.
 
-   Clicking the system tray icon will reveal several options, as seen
-   in the screenshots below:
+   Clicking the system tray icon will reveal several options, as
+   seen in the screenshots below:
 
-   The Service Instance menu is the main MySQL Notifier window, and
-   enables you to Stop, Start, and Restart the MySQL Server.
+   The Service Instance menu is the main MySQL Notifier window,
+   and enables you to Stop, Start, and Restart the MySQL Server.
 
-   Figure 2.22 MySQL Notifier Service Instance menu
+   Figure 2.32 MySQL Notifier Service Instance menu
    MySQL Notifier Service Instance menu
 
-   The Actions menu includes several links to external applications
-   (if they are installed), and a Refresh Status option to manually
-   refresh the status of all monitored services (in both local and
-   remote computers) and MySQL instances.
+   The Actions menu includes several links to external
+   applications (if they are installed), and a Refresh Status
+   option to manually refresh the status of all monitored
+   services (in both local and remote computers) and MySQL
+   instances.
    Note
 
-   The main menu will not show the Actions menu when there are no
-   services being monitored by MySQL Notifier.
+   The main menu will not show the Actions menu when there are
+   no services being monitored by MySQL Notifier.
    Note
 
    The Refresh Status feature is available since MySQL Notifier
    1.1.0.
 
-   Figure 2.23 MySQL Notifier Actions menu
+   Figure 2.33 MySQL Notifier Actions menu
    MySQL Notifier Actions menu
 
-   The Actions, Options menu configures MySQL Notifier and includes
-   options to:
+   The Actions, Options menu configures MySQL Notifier and
+   includes options to:
 
-     * Use colorful status icons: Enables a colorful style of icons
-       for the tray of the MySQL Notifier.
+     * Use colorful status icons: Enables a colorful style of
+       icons for the tray of the MySQL Notifier.
 
-     * Run at Windows Startup: Allows the application to be loaded
-       when Microsoft Windows starts.
+     * Run at Windows Startup: Allows the application to be
+       loaded when Microsoft Windows starts.
 
-     * Automatically Check For Updates Every # Weeks: Checks for a
-       new version of MySQL Notifier, and runs this check every #
-       weeks.
-
-     * Automatically add new services whose name contains: The text
-       used to filter services and add them automatically to the
-       monitored list of the local computer running MySQL Notifier,
-       and on remote computers already monitoring Windows services.
-       monitored services, and also filters the list of the Microsoft
-       Windows services for the Add New Service dialog.
-       Prior to version 1.1.0, this option was named "Automatically
-       add new services that match this pattern."
-
-     * Notify me when a service is automatically added: Will display
-       a balloon notification from the taskbar when a newly
-       discovered service is added to the monitored services list.
+     * Automatically Check For Updates Every # Weeks: Checks for
+       a new version of MySQL Notifier, and runs this check
+       every # weeks.
+
+     * Automatically add new services whose name contains: The
+       text used to filter services and add them automatically
+       to the monitored list of the local computer running MySQL
+       Notifier, and on remote computers already monitoring
+       Windows services. monitored services, and also filters
+       the list of the Microsoft Windows services for the Add
+       New Service dialog.
+       Prior to version 1.1.0, this option was named
+       "Automatically add new services that match this pattern."
+
+     * Notify me when a service is automatically added: Will
+       display a balloon notification from the taskbar when a
+       newly discovered service is added to the monitored
+       services list.
 
      * Notify me when a service changes status: Will display a
-       balloon notification from the taskbar when a monitored service
-       changes its status.
+       balloon notification from the taskbar when a monitored
+       service changes its status.
 
-   Figure 2.24 MySQL Notifier Options menu
+   Figure 2.34 MySQL Notifier Options menu
    MySQL Notifier Options menu
 
-   The Actions, Manage Monitored Items menu enables you to configure
-   the monitored services and MySQL instances. First, with the
-   Services tab open:
+   The Actions, Manage Monitored Items menu enables you to
+   configure the monitored services and MySQL instances. First,
+   with the Services tab open:
 
-   Figure 2.25 MySQL Notifier Manage Services menu
+   Figure 2.35 MySQL Notifier Manage Services menu
    MySQL Notifier Manage Services menu
 
    The Instances tab is similar:
 
-   Figure 2.26 MySQL Notifier Manage Instances menu
+   Figure 2.36 MySQL Notifier Manage Instances menu
    MySQL Notifier Manage Instances menu
 
-   Adding a service or instance (after clicking Add in the Manage
-   Monitored Items window) enables you to select a running Microsoft
-   Windows service or instance connection, and configure MySQL
-   Notifier to monitor it. Add a new service or instance by clicking
-   service name from the list, then OK to accept. Multiple services
-   and instances may be selected.
+   Adding a service or instance (after clicking Add in the
+   Manage Monitored Items window) enables you to select a
+   running Microsoft Windows service or instance connection, and
+   configure MySQL Notifier to monitor it. Add a new service or
+   instance by clicking service name from the list, then OK to
+   accept. Multiple services and instances may be selected.
 
-   Figure 2.27 MySQL Notifier Adding new services
+   Figure 2.37 MySQL Notifier Adding new services
    MySQL Notifier Adding new services
 
    And instances:
 
-   Figure 2.28 MySQL Notifier Adding new instances
+   Figure 2.38 MySQL Notifier Adding new instances
    MySQL Notifier Adding new instances
    Note
 
@@ -896,334 +1314,359 @@ C:\> MySQLInstallerConsole --help
 
 2.3.4.1 Remote monitoring set up and installation instructions
 
-   The MySQL Notifier uses Windows Management Instrumentation (WMI)
-   to manage and monitor services in remote computers running Windows
-   XP or later. This guide explains how it works, and how to set up
-   your system to monitor remote MySQL instances.
+   The MySQL Notifier uses Windows Management Instrumentation
+   (WMI) to manage and monitor services in remote computers
+   running Windows XP or later. This guide explains how it
+   works, and how to set up your system to monitor remote MySQL
+   instances.
    Note
 
    Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   In order to configure WMI, it is important to understand that the
-   underlying Distributed Component Object Model (DCOM) architecture
-   is doing the WMI work. Specifically, MySQL Notifier is using
-   asynchronous notification queries on remote Microsoft Windows
-   hosts as .NET events. These events send an asynchronous callback
-   to the computer running the MySQL Notifier so it knows when a
-   service status has changed on the remote computer. Asynchronous
-   notifications offer the best performance compared to
-   semisynchronous notifications or synchronous notifications that
-   use timers.
-
-   Asynchronous notifications requires the remote computer to send a
-   callback to the client computer (thus opening a reverse
-   connection), so the Windows Firewall and DCOM settings must be
-   properly configured for the communication to function properly.
+   In order to configure WMI, it is important to understand that
+   the underlying Distributed Component Object Model (DCOM)
+   architecture is doing the WMI work. Specifically, MySQL
+   Notifier is using asynchronous notification queries on remote
+   Microsoft Windows hosts as .NET events. These events send an
+   asynchronous callback to the computer running the MySQL
+   Notifier so it knows when a service status has changed on the
+   remote computer. Asynchronous notifications offer the best
+   performance compared to semisynchronous notifications or
+   synchronous notifications that use timers.
+
+   Asynchronous notifications requires the remote computer to
+   send a callback to the client computer (thus opening a
+   reverse connection), so the Windows Firewall and DCOM
+   settings must be properly configured for the communication to
+   function properly.
 
-   Figure 2.29 MySQL Notifier Distributed Component Object Model
+   Figure 2.39 MySQL Notifier Distributed Component Object Model
    (DCOM)
    MySQL Notifier Distributed Component Object Model (DCOM)
 
-   Most of the common errors thrown by asynchronous WMI notifications
-   are related to Windows Firewall blocking the communication, or to
-   DCOM / WMI settings not being set up properly. For a list of
-   common errors with solutions, see Section 2.3.4.1, "."
-
-   The following steps are required to make WMI function. These steps
-   are divided between two machines. A single host computer that runs
-   MySQL Notifier (Computer A), and multiple remote machines that are
-   being monitored (Computer B).
+   Most of the common errors thrown by asynchronous WMI
+   notifications are related to Windows Firewall blocking the
+   communication, or to DCOM / WMI settings not being set up
+   properly. For a list of common errors with solutions, see
+   Section 2.3.4.1, "."
+
+   The following steps are required to make WMI function. These
+   steps are divided between two machines. A single host
+   computer that runs MySQL Notifier (Computer A), and multiple
+   remote machines that are being monitored (Computer B).
 
 Computer running MySQL Notifier (Computer A)
 
 
-    1. Allow for remote administration by either editing the Group
-       Policy Editor, or using NETSH:
+    1. Allow for remote administration by either editing the
+       Group Policy Editor, or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
+
     2. Open the DCOM port TCP 135:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator) .
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator) .
          b. Execute the following command:
 NETSH firewall add portopening protocol=tcp port=135 name=DCOM_TCP135
 
-    3. Add the client application which contains the sink for the
-       callback (MySqlNotifier.exe) to the Windows Firewall
-       Exceptions List (use either the Windows Firewall configuration
-       or NETSH):
+
+    3. Add the client application which contains the sink for
+       the callback (MySqlNotifier.exe) to the Windows Firewall
+       Exceptions List (use either the Windows Firewall
+       configuration or NETSH):
        Using the Windows Firewall configuration:
          a. In the Control Panel, double-click Windows Firewall.
-         b. In the Windows Firewall window's left panel, click Allow
-            a program or feature through Windows Firewall.
-         c. In the Allowed Programs window, click Change Settings.
+         b. In the Windows Firewall window's left panel, click
+            Allow a program or feature through Windows Firewall.
+         c. In the Allowed Programs window, click Change
+            Settings.
          d. If MySqlNotifier.exe is in the Allowed programs and
-            features list, make sure it is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+            features list, make sure it is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
          e. If MySqlNotifier.exe is not in the list, click Allow
             another program....
-         f. In the Add a Program window, select the MySqlNotifier.exe
-            if it exists in the Programs list, otherwise click
-            Browse... and go to the directory where MySqlNotifier.exe
-            was installed to select it, then click Add.
-         g. Make sure MySqlNotifier.exe is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+         f. In the Add a Program window, select the
+            MySqlNotifier.exe if it exists in the Programs list,
+            otherwise click Browse... and go to the directory
+            where MySqlNotifier.exe was installed to select it,
+            then click Add.
+         g. Make sure MySqlNotifier.exe is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command, where you change
             "[YOUR_INSTALL_DIRECTORY]":
-NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\My
-SqlNotifier.exe name=MySqlNotifier
+NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\MyS
+qlNotifier.exe name=MySqlNotifier
+
 
     4. If Computer B is either a member of WORKGROUP or is in a
-       different domain that is untrusted by Computer A, then the
-       callback connection (Connection 2) is created as an Anonymous
-       connection. To grant Anonymous connections DCOM Remote Access
-       permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+       different domain that is untrusted by Computer A, then
+       the callback connection (Connection 2) is created as an
+       Anonymous connection. To grant Anonymous connections DCOM
+       Remote Access permissions:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
 Monitored Remote Computer (Computer B)
 
-   If the user account that is logged into the computer running the
-   MySQL Notifier (Computer A) is a local administrator on the remote
-   computer (Computer B), such that the same account is an
-   administrator on Computer B, you can skip to the "Allow for remote
-   administration" step.
-
-   Setting DCOM security to allow a non-administrator user to access
-   a computer remotely:
-
-    1. Grant "DCOM remote launch" and activation permissions for a
-       user or group:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+   If the user account that is logged into the computer running
+   the MySQL Notifier (Computer A) is a local administrator on
+   the remote computer (Computer B), such that the same account
+   is an administrator on Computer B, you can skip to the "Allow
+   for remote administration" step.
+
+   Setting DCOM security to allow a non-administrator user to
+   access a computer remotely:
+
+    1. Grant "DCOM remote launch" and activation permissions for
+       a user or group:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Launch Permission dialog box, follow these steps
-            if your name or your group does not appear in the Groups
-            or user names list:
+         e. In the Launch Permission dialog box, follow these
+            steps if your name or your group does not appear in
+            the Groups or user names list:
               i. In the Launch Permission dialog box, click Add.
-             ii. In the Select Users, Computers, or Groups dialog
-                 box, add your name and the group in the "Enter the
-                 object names to select" box, and then click OK.
-         f. In the Launch Permission dialog box, select your user and
-            group in the Group or user names box. In the Allow column
-            under Permissions for User, select Remote Launch, select
-            Remote Activation, and then click OK.
+             ii. In the Select Users, Computers, or Groups
+                 dialog box, add your name and the group in the
+                 "Enter the object names to select" box, and
+                 then click OK.
+         f. In the Launch Permission dialog box, select your
+            user and group in the Group or user names box. In
+            the Allow column under Permissions for User, select
+            Remote Launch, select Remote Activation, and then
+            click OK.
        Grant DCOM remote access permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
     2. Allowing non-administrator users access to a specific WMI
        namespace:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
-         c. In the Computer Management window, expand the Services
-            and Applications tree and double-click the WMI Control.
-         d. Right-click the WMI Control icon and select Properties.
-         e. In the WMI Control Properties window, click the Security
-            tab.
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
+         c. In the Computer Management window, expand the
+            Services and Applications tree and double-click the
+            WMI Control.
+         d. Right-click the WMI Control icon and select
+            Properties.
+         e. In the WMI Control Properties window, click the
+            Security tab.
          f. In the Security tab, select the namespace and click
             Security.
-         g. Locate the appropriate account and check Remote Enable in
-            the Permissions list.
+         g. Locate the appropriate account and check Remote
+            Enable in the Permissions list.
 
-    3. Allow for remote administration by either editing the Group
-       Policy Editor or using NETSH:
+    3. Allow for remote administration by either editing the
+       Group Policy Editor or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
-    4. Now, be sure the user you are logging in with uses the Name
-       value and not the Full Name value:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
+
+    4. Now, be sure the user you are logging in with uses the
+       Name value and not the Full Name value:
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
          c. In the Computer Management window, expand the System
             Tools then Local Users and Groups.
-         d. Click the Users node, and on the right side panel locate
-            your user and make sure it uses the Name value to
-            connect, and not the Full Name value.
-
-    5. If the remote computer is running on Windows XP Professional,
-       make sure that remote logins are not being forcefully changed
-       to the guest account user (also known as ForceGuest), which is
-       enabled by default on computers that are not attached to a
-       domain.
-         a. Click Start, click Run, type SECPOL.MSC, and then click
-            OK.
+         d. Click the Users node, and on the right side panel
+            locate your user and make sure it uses the Name
+            value to connect, and not the Full Name value.
+
+    5. If the remote computer is running on Windows XP
+       Professional, make sure that remote logins are not being
+       forcefully changed to the guest account user (also known
+       as ForceGuest), which is enabled by default on computers
+       that are not attached to a domain.
+         a. Click Start, click Run, type SECPOL.MSC, and then
+            click OK.
          b. Under the Local Policies node, double-click Security
             Options.
-         c. Select Network Access: Sharing and security model for
-            local accounts and save.
+         c. Select Network Access: Sharing and security model
+            for local accounts and save.
 
 Common Errors
 
 
      * 0x80070005
 
-          + DCOM Security was not configured properly (see Computer
-            B, the Setting DCOM security... step).
+          + DCOM Security was not configured properly (see
+            Computer B, the Setting DCOM security... step).
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x8007000E
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x80041003
 
-          + Access to the remote WMI namespace was not configured
-            properly (see Computer B, the Allowing non-administrator
-            users access to a specific WMI namespace step).
+          + Access to the remote WMI namespace was not
+            configured properly (see Computer B, the Allowing
+            non-administrator users access to a specific WMI
+            namespace step).
 
      * 0x800706BA
 
           + The DCOM port is not open on the client computers
-            (Computer A) firewall. See the Open the DCOM port TCP 135
-            step for Computer A.
+            (Computer A) firewall. See the Open the DCOM port
+            TCP 135 step for Computer A.
 
-          + The remote computer (Computer B) is inaccessible because
-            its network location is set to Public. Make sure you can
-            access it through the Windows Explorer.
+          + The remote computer (Computer B) is inaccessible
+            because its network location is set to Public. Make
+            sure you can access it through the Windows Explorer.
 
 2.3.5 Installing MySQL on Microsoft Windows Using an MSI Package
 
-   The MSI package is designed to install and configure MySQL in such
-   a way that you can immediately get started using MySQL.
+   The MSI package is designed to install and configure MySQL in
+   such a way that you can immediately get started using MySQL.
 
-   The MySQL Installation Wizard and MySQL Configuration Wizard are
-   available in the Complete install package, which is recommended
-   for most standard MySQL installations. Exceptions include users
-   who need to install multiple instances of MySQL on a single server
-   host and advanced users who want complete control of server
-   configuration.
+   The MySQL Installation Wizard and MySQL Configuration Wizard
+   are available in the Complete install package, which is
+   recommended for most standard MySQL installations. Exceptions
+   include users who need to install multiple instances of MySQL
+   on a single server host and advanced users who want complete
+   control of server configuration.
 
      * For information on installing using the GUI MSI installer
-       process, see Section 2.3.5.1, "Using the MySQL Installation
-       Wizard."
+       process, see Section 2.3.5.1, "Using the MySQL
+       Installation Wizard."
 
-     * For information on installing using the command line using the
-       MSI package, see Section 2.3.5.2, "Automating MySQL
-       Installation on Microsoft Windows Using the MSI Package."
-
-     * If you have previously installed MySQL using the MSI package
-       and want to remove MySQL, see Section 2.3.5.3, "Removing MySQL
-       When Installed from the MSI Package."
+     * For information on installing using the command line
+       using the MSI package, see Section 2.3.5.2, "Automating
+       MySQL Installation on Microsoft Windows Using the MSI
+       Package."
+
+     * If you have previously installed MySQL using the MSI
+       package and want to remove MySQL, see Section 2.3.5.3,
+       "Removing MySQL When Installed from the MSI Package."
 
    The workflow sequence for using the installer is shown in the
    figure below:
 
-   Figure 2.30 Installation Workflow for Windows Using MSI Installer
+   Figure 2.40 Installation Workflow for Windows Using MSI
+   Installer
    Installation Workflow for Windows using MSI Installer
    Note
 
    Microsoft Windows XP and later include a firewall which
-   specifically blocks ports. If you plan on using MySQL through a
-   network port then you should open and create an exception for this
-   port before performing the installation. To check and if necessary
-   add an exception to the firewall settings:
+   specifically blocks ports. If you plan on using MySQL through
+   a network port then you should open and create an exception
+   for this port before performing the installation. To check
+   and if necessary add an exception to the firewall settings:
 
-    1. First ensure that you are logged in as an Administrator or a
-       user with Administrator privileges.
+    1. First ensure that you are logged in as an Administrator
+       or a user with Administrator privileges.
 
-    2. Go to the Control Panel, and double click the Windows Firewall
-       icon.
+    2. Go to the Control Panel, and double click the Windows
+       Firewall icon.
 
-    3. Choose the Allow a program through Windows Firewall option and
-       click the Add port button.
+    3. Choose the Allow a program through Windows Firewall
+       option and click the Add port button.
 
-    4. Enter MySQL into the Name text box and 3306 (or the port of
-       your choice) into the Port number text box.
+    4. Enter MySQL into the Name text box and 3306 (or the port
+       of your choice) into the Port number text box.
 
-    5. Also ensure that the TCP protocol radio button is selected.
+    5. Also ensure that the TCP protocol radio button is
+       selected.
 
-    6. If you wish, you can also limit access to the MySQL server by
-       choosing the Change scope button.
+    6. If you wish, you can also limit access to the MySQL
+       server by choosing the Change scope button.
 
     7. Confirm your choices by clicking the OK button.
 
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
    Note
 
-   When using Windows Vista or newer, you may want to disable User
-   Account Control (UAC) before performing the installation. If you
-   do not do so, then MySQL may be identified as a security risk,
-   which will mean that you need to enable MySQL. You can disable the
-   security checking by following these instructions:
+   When using Windows Vista or newer, you may want to disable
+   User Account Control (UAC) before performing the
+   installation. If you do not do so, then MySQL may be
+   identified as a security risk, which will mean that you need
+   to enable MySQL. You can disable the security checking by
+   following these instructions:
 
     1. Open Control Panel.
 
@@ -1233,199 +1676,213 @@ Common Errors
     3. Click the Got to the main User Accounts page link.
 
     4. Click on Turn User Account Control on or off. You may be
-       prompted to provide permission to change this setting. Click
-       Continue.
+       prompted to provide permission to change this setting.
+       Click Continue.
 
-    5. Deselect or uncheck the check box next to Use User Account
-       Control (UAC) to help protect your computer. Click OK to save
-       the setting.
-
-   You will need to restart to complete the process. Click Restart
-   Now to reboot the machine and apply the changes. You can then
-   follow the instructions below for installing Windows.
+    5. Deselect or uncheck the check box next to Use User
+       Account Control (UAC) to help protect your computer.
+       Click OK to save the setting.
+
+   You will need to restart to complete the process. Click
+   Restart Now to reboot the machine and apply the changes. You
+   can then follow the instructions below for installing
+   Windows.
 
 2.3.5.1 Using the MySQL Installation Wizard
 
-   MySQL Installation Wizard is an installer for the MySQL server
-   that uses the latest installer technologies for Microsoft Windows.
-   The MySQL Installation Wizard, in combination with the MySQL
-   Configuration Wizard, enables a user to install and configure a
-   MySQL server that is ready for use immediately after installation.
-
-   The MySQL Installation Wizard is the standard installer for all
-   MySQL server distributions, version 4.1.5 and higher. Users of
-   previous versions of MySQL need to shut down and remove their
-   existing MySQL installations manually before installing MySQL with
-   the MySQL Installation Wizard. See Section 2.3.5.1.6, "Upgrading
-   MySQL with the Installation Wizard," for more information on
-   upgrading from a previous version.
+   MySQL Installation Wizard is an installer for the MySQL
+   server that uses the latest installer technologies for
+   Microsoft Windows. The MySQL Installation Wizard, in
+   combination with the MySQL Configuration Wizard, enables a
+   user to install and configure a MySQL server that is ready
+   for use immediately after installation.
+
+   The MySQL Installation Wizard is the standard installer for
+   all MySQL server distributions, version 4.1.5 and higher.
+   Users of previous versions of MySQL need to shut down and
+   remove their existing MySQL installations manually before
+   installing MySQL with the MySQL Installation Wizard. See
+   Section 2.3.5.1.6, "Upgrading MySQL with the Installation
+   Wizard," for more information on upgrading from a previous
+   version.
 
    Microsoft has included an improved version of their Microsoft
-   Windows Installer (MSI) in the recent versions of Windows. MSI has
-   become the de-facto standard for application installations on
-   Windows 2000, Windows XP, and Windows Server 2003. The MySQL
-   Installation Wizard makes use of this technology to provide a
-   smoother and more flexible installation process.
+   Windows Installer (MSI) in the recent versions of Windows.
+   MSI has become the de-facto standard for application
+   installations on Windows 2000, Windows XP, and Windows Server
+   2003. The MySQL Installation Wizard makes use of this
+   technology to provide a smoother and more flexible
+   installation process.
 
    The Microsoft Windows Installer Engine was updated with the
-   release of Windows XP; those using a previous version of Windows
-   can reference this Microsoft Knowledge Base article
-   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;292539)
-   for information on upgrading to the latest version of the Windows
-   Installer Engine.
-
-   In addition, Microsoft has introduced the WiX (Windows Installer
-   XML) toolkit recently. This is the first highly acknowledged Open
-   Source project from Microsoft. We have switched to WiX because it
-   is an Open Source project and it enables us to handle the complete
-   Windows installation process in a flexible manner using scripts.
-
-   Improving the MySQL Installation Wizard depends on the support and
-   feedback of users like you. If you find that the MySQL
-   Installation Wizard is lacking some feature important to you, or
-   if you discover a bug, please report it in our bugs database using
-   the instructions given in Section 1.7, "How to Report Bugs or
-   Problems."
+   release of Windows XP; those using a previous version of
+   Windows can reference this Microsoft Knowledge Base article
+   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;2925
+   39) for information on upgrading to the latest version of the
+   Windows Installer Engine.
+
+   In addition, Microsoft has introduced the WiX (Windows
+   Installer XML) toolkit recently. This is the first highly
+   acknowledged Open Source project from Microsoft. We have
+   switched to WiX because it is an Open Source project and it
+   enables us to handle the complete Windows installation
+   process in a flexible manner using scripts.
+
+   Improving the MySQL Installation Wizard depends on the
+   support and feedback of users like you. If you find that the
+   MySQL Installation Wizard is lacking some feature important
+   to you, or if you discover a bug, please report it in our
+   bugs database using the instructions given in Section 1.7,
+   "How to Report Bugs or Problems."
 
 2.3.5.1.1 Downloading and Starting the MySQL Installation Wizard
 
    The MySQL installation packages can be downloaded from
-   http://dev.mysql.com/downloads/. If the package you download is
-   contained within a Zip archive, you need to extract the archive
-   first.
-   Note
-
-   If you are installing on Windows Vista or newer, it is best to
-   open a network port before beginning the installation. To do this,
-   first ensure that you are logged in as an Administrator, go to the
-   Control Panel, and double-click the Windows Firewall icon. Choose
-   the Allow a program through Windows Firewall option and click the
-   Add port button. Enter MySQL into the Name text box and 3306 (or
-   the port of your choice) into the Port number text box. Also
-   ensure that the TCP protocol radio button is selected. If you
-   wish, you can also limit access to the MySQL server by choosing
-   the Change scope button. Confirm your choices by clicking the OK
-   button. If you do not open a port prior to installation, you
-   cannot configure the MySQL server immediately after installation.
+   http://dev.mysql.com/downloads/. If the package you download
+   is contained within a Zip archive, you need to extract the
+   archive first.
+   Note
+
+   If you are installing on Windows Vista or newer, it is best
+   to open a network port before beginning the installation. To
+   do this, first ensure that you are logged in as an
+   Administrator, go to the Control Panel, and double-click the
+   Windows Firewall icon. Choose the Allow a program through
+   Windows Firewall option and click the Add port button. Enter
+   MySQL into the Name text box and 3306 (or the port of your
+   choice) into the Port number text box. Also ensure that the
+   TCP protocol radio button is selected. If you wish, you can
+   also limit access to the MySQL server by choosing the Change
+   scope button. Confirm your choices by clicking the OK button.
+   If you do not open a port prior to installation, you cannot
+   configure the MySQL server immediately after installation.
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
 
-   The process for starting the wizard depends on the contents of the
-   installation package you download. If there is a setup.exe file
-   present, double-click it to start the installation process. If
-   there is an .msi file present, double-click it to start the
-   installation process.
+   The process for starting the wizard depends on the contents
+   of the installation package you download. If there is a
+   setup.exe file present, double-click it to start the
+   installation process. If there is an .msi file present,
+   double-click it to start the installation process.
 
 2.3.5.1.2 Choosing an Install Type
 
-   There are three installation types available: Typical, Complete,
-   and Custom.
+   There are three installation types available: Typical,
+   Complete, and Custom.
 
-   The Typical installation type installs the MySQL server, the mysql
-   command-line client, and the command-line utilities. The
-   command-line clients and utilities include mysqldump, myisamchk,
-   and several other tools to help you manage the MySQL server.
-
-   The Complete installation type installs all components included in
-   the installation package. The full installation package includes
-   components such as the embedded server library, the benchmark
-   suite, support scripts, and documentation.
-
-   The Custom installation type gives you complete control over which
-   packages you wish to install and the installation path that is
-   used. See Section 2.3.5.1.3, "The Custom Install Dialog," for more
-   information on performing a custom install.
-
-   If you choose the Typical or Complete installation types and click
-   the Next button, you advance to the confirmation screen to verify
-   your choices and begin the installation. If you choose the Custom
-   installation type and click the Next button, you advance to the
-   custom installation dialog, described in Section 2.3.5.1.3, "The
-   Custom Install Dialog."
+   The Typical installation type installs the MySQL server, the
+   mysql command-line client, and the command-line utilities.
+   The command-line clients and utilities include mysqldump,
+   myisamchk, and several other tools to help you manage the
+   MySQL server.
+
+   The Complete installation type installs all components
+   included in the installation package. The full installation
+   package includes components such as the embedded server
+   library, the benchmark suite, support scripts, and
+   documentation.
+
+   The Custom installation type gives you complete control over
+   which packages you wish to install and the installation path
+   that is used. See Section 2.3.5.1.3, "The Custom Install
+   Dialog," for more information on performing a custom install.
+
+   If you choose the Typical or Complete installation types and
+   click the Next button, you advance to the confirmation screen
+   to verify your choices and begin the installation. If you
+   choose the Custom installation type and click the Next
+   button, you advance to the custom installation dialog,
+   described in Section 2.3.5.1.3, "The Custom Install Dialog."
 
 2.3.5.1.3 The Custom Install Dialog
 
    If you wish to change the installation path or the specific
-   components that are installed by the MySQL Installation Wizard,
-   choose the Custom installation type.
+   components that are installed by the MySQL Installation
+   Wizard, choose the Custom installation type.
 
-   A tree view on the left side of the custom install dialog lists
-   all available components. Components that are not installed have a
-   red X icon; components that are installed have a gray icon. To
-   change whether a component is installed, click that component's
-   icon and choose a new option from the drop-down list that appears.
+   A tree view on the left side of the custom install dialog
+   lists all available components. Components that are not
+   installed have a red X icon; components that are installed
+   have a gray icon. To change whether a component is installed,
+   click that component's icon and choose a new option from the
+   drop-down list that appears.
 
    You can change the default installation path by clicking the
-   Change... button to the right of the displayed installation path.
+   Change... button to the right of the displayed installation
+   path.
 
-   After choosing your installation components and installation path,
-   click the Next button to advance to the confirmation dialog.
+   After choosing your installation components and installation
+   path, click the Next button to advance to the confirmation
+   dialog.
 
 2.3.5.1.4 The Confirmation Dialog
 
-   Once you choose an installation type and optionally choose your
-   installation components, you advance to the confirmation dialog.
-   Your installation type and installation path are displayed for you
-   to review.
-
-   To install MySQL if you are satisfied with your settings, click
-   the Install button. To change your settings, click the Back
-   button. To exit the MySQL Installation Wizard without installing
-   MySQL, click the Cancel button.
+   Once you choose an installation type and optionally choose
+   your installation components, you advance to the confirmation
+   dialog. Your installation type and installation path are
+   displayed for you to review.
+
+   To install MySQL if you are satisfied with your settings,
+   click the Install button. To change your settings, click the
+   Back button. To exit the MySQL Installation Wizard without
+   installing MySQL, click the Cancel button.
 
    The final screen of the installer provides a summary of the
    installation and gives you the option to launch the MySQL
-   Configuration Wizard, which you can use to create a configuration
-   file, install the MySQL service, and configure security settings.
+   Configuration Wizard, which you can use to create a
+   configuration file, install the MySQL service, and configure
+   security settings.
 
 2.3.5.1.5 Changes Made by MySQL Installation Wizard
 
-   Once you click the Install button, the MySQL Installation Wizard
-   begins the installation process and makes certain changes to your
-   system which are described in the sections that follow.
+   Once you click the Install button, the MySQL Installation
+   Wizard begins the installation process and makes certain
+   changes to your system which are described in the sections
+   that follow.
 
    Changes to the Registry
 
-   The MySQL Installation Wizard creates one Windows registry key in
-   a typical install situation, located in
+   The MySQL Installation Wizard creates one Windows registry
+   key in a typical install situation, located in
    HKEY_LOCAL_MACHINE\SOFTWARE\MySQL AB.
 
-   The MySQL Installation Wizard creates a key named after the major
-   version of the server that is being installed, such as MySQL
-   Server 5.5. It contains two string values, Location and Version.
-   The Location string contains the path to the installation
-   directory. In a default installation it contains C:\Program
-   Files\MySQL\MySQL Server 5.5\. The Version string contains the
-   release number. For example, for an installation of MySQL Server
-   5.5.41, the key contains a value of 5.5.41.
-
-   These registry keys are used to help external tools identify the
-   installed location of the MySQL server, preventing a complete scan
-   of the hard-disk to determine the installation path of the MySQL
-   server. The registry keys are not required to run the server, and
-   if you install MySQL using the noinstall Zip archive, the registry
-   keys are not created.
+   The MySQL Installation Wizard creates a key named after the
+   major version of the server that is being installed, such as
+   MySQL Server 5.5. It contains two string values, Location and
+   Version. The Location string contains the path to the
+   installation directory. In a default installation it contains
+   C:\Program Files\MySQL\MySQL Server 5.5\. The Version string
+   contains the release number. For example, for an installation
+   of MySQL Server 5.5.42, the key contains a value of 5.5.42.
+
+   These registry keys are used to help external tools identify
+   the installed location of the MySQL server, preventing a
+   complete scan of the hard-disk to determine the installation
+   path of the MySQL server. The registry keys are not required
+   to run the server, and if you install MySQL using the
+   noinstall Zip archive, the registry keys are not created.
 
    Changes to the Start Menu
 
-   The MySQL Installation Wizard creates a new entry in the Windows
-   Start menu under a common MySQL menu heading named after the major
-   version of MySQL that you have installed. For example, if you
-   install MySQL 5.5, the MySQL Installation Wizard creates a MySQL
-   Server 5.5 section in the Start menu.
+   The MySQL Installation Wizard creates a new entry in the
+   Windows Start menu under a common MySQL menu heading named
+   after the major version of MySQL that you have installed. For
+   example, if you install MySQL 5.5, the MySQL Installation
+   Wizard creates a MySQL Server 5.5 section in the Start menu.
 
    The following entries are created within the new Start menu
    section:
 
-     * MySQL Command-Line Client: This is a shortcut to the mysql
-       command-line client and is configured to connect as the root
-       user. The shortcut prompts for a root user password when you
-       connect.
-
-     * MySQL Server Instance Config Wizard: This is a shortcut to the
-       MySQL Configuration Wizard. Use this shortcut to configure a
-       newly installed server, or to reconfigure an existing server.
+     * MySQL Command-Line Client: This is a shortcut to the
+       mysql command-line client and is configured to connect as
+       the root user. The shortcut prompts for a root user
+       password when you connect.
+
+     * MySQL Server Instance Config Wizard: This is a shortcut
+       to the MySQL Configuration Wizard. Use this shortcut to
+       configure a newly installed server, or to reconfigure an
+       existing server.
 
      * MySQL Documentation: This is a link to the MySQL server
        documentation that is stored locally in the MySQL server
@@ -1433,23 +1890,23 @@ Common Errors
 
    Changes to the File System
 
-   The MySQL Installation Wizard by default installs the MySQL 5.5
-   server to C:\Program Files\MySQL\MySQL Server 5.5, where Program
-   Files is the default location for applications in your system, and
-   5.5 is the major version of your MySQL server. This is the
-   recommended location for the MySQL server, replacing the former
-   default location C:\mysql.
+   The MySQL Installation Wizard by default installs the MySQL
+   5.5 server to C:\Program Files\MySQL\MySQL Server 5.5, where
+   Program Files is the default location for applications in
+   your system, and 5.5 is the major version of your MySQL
+   server. This is the recommended location for the MySQL
+   server, replacing the former default location C:\mysql.
 
    By default, all MySQL applications are stored in a common
-   directory at C:\Program Files\MySQL, where Program Files is the
-   default location for applications in your Windows installation. A
-   typical MySQL installation on a developer machine might look like
-   this:
+   directory at C:\Program Files\MySQL, where Program Files is
+   the default location for applications in your Windows
+   installation. A typical MySQL installation on a developer
+   machine might look like this:
 C:\Program Files\MySQL\MySQL Server 5.5
 C:\Program Files\MySQL\MySQL Workbench 5.1 OSS
 
-   This approach makes it easier to manage and maintain all MySQL
-   applications installed on a particular system.
+   This approach makes it easier to manage and maintain all
+   MySQL applications installed on a particular system.
 
    The default location of the data directory is the AppData
    directory configured for the user that installed the MySQL
@@ -1458,93 +1915,97 @@ C:\Program Files\MySQL\MySQL Workbench 5
 2.3.5.1.6 Upgrading MySQL with the Installation Wizard
 
    The MySQL Installation Wizard can perform server upgrades
-   automatically using the upgrade capabilities of MSI. That means
-   you do not need to remove a previous installation manually before
-   installing a new release. The installer automatically shuts down
-   and removes the previous MySQL service before installing the new
-   version.
+   automatically using the upgrade capabilities of MSI. That
+   means you do not need to remove a previous installation
+   manually before installing a new release. The installer
+   automatically shuts down and removes the previous MySQL
+   service before installing the new version.
 
    Automatic upgrades are available only when upgrading between
-   installations that have the same major and minor version numbers.
-   For example, you can upgrade automatically from MySQL 5.5.5 to
-   MySQL 5.5.6, but not from MySQL 5.1 to MySQL 5.5.
+   installations that have the same major and minor version
+   numbers. For example, you can upgrade automatically from
+   MySQL 5.5.5 to MySQL 5.5.6, but not from MySQL 5.1 to MySQL
+   5.5.
 
    See Section 2.3.9, "Upgrading MySQL on Windows."
 
-2.3.5.2 Automating MySQL Installation on Microsoft Windows Using the
-MSI Package
+2.3.5.2 Automating MySQL Installation on Microsoft Windows Using
+the MSI Package
 
    The Microsoft Installer (MSI) supports a both a quiet and a
    passive mode that can be used to install MySQL automatically
-   without requiring intervention. You can use this either in scripts
-   to automatically install MySQL or through a terminal connection
-   such as Telnet where you do not have access to the standard
-   Windows user interface. The MSI packages can also be used in
-   combination with Microsoft's Group Policy system (part of Windows
-   Server 2003 and Windows Server 2008) to install MySQL across
-   multiple machines.
-
-   To install MySQL from one of the MSI packages automatically from
-   the command line (or within a script), you need to use the
-   msiexec.exe tool. For example, to perform a quiet installation
-   (which shows no dialog boxes or progress):
-shell> msiexec /i mysql-5.5.41.msi /quiet
-
-   The /i indicates that you want to perform an installation. The
-   /quiet option indicates that you want no interactive elements.
-
-   To provide a dialog box showing the progress during installation,
-   and the dialog boxes providing information on the installation and
-   registration of MySQL, use /passive mode instead of /quiet:
-shell> msiexec /i mysql-5.5.41.msi /passive
-
-   Regardless of the mode of the installation, installing the package
-   in this manner performs a 'Typical' installation, and installs the
-   default components into the standard location.
+   without requiring intervention. You can use this either in
+   scripts to automatically install MySQL or through a terminal
+   connection such as Telnet where you do not have access to the
+   standard Windows user interface. The MSI packages can also be
+   used in combination with Microsoft's Group Policy system
+   (part of Windows Server 2003 and Windows Server 2008) to
+   install MySQL across multiple machines.
+
+   To install MySQL from one of the MSI packages automatically
+   from the command line (or within a script), you need to use
+   the msiexec.exe tool. For example, to perform a quiet
+   installation (which shows no dialog boxes or progress):
+shell> msiexec /i mysql-5.5.42.msi /quiet
+
+   The /i indicates that you want to perform an installation.
+   The /quiet option indicates that you want no interactive
+   elements.
+
+   To provide a dialog box showing the progress during
+   installation, and the dialog boxes providing information on
+   the installation and registration of MySQL, use /passive mode
+   instead of /quiet:
+shell> msiexec /i mysql-5.5.42.msi /passive
+
+   Regardless of the mode of the installation, installing the
+   package in this manner performs a 'Typical' installation, and
+   installs the default components into the standard location.
 
    You can also use this method to uninstall MySQL by using the
    /uninstall or /x options:
-shell> msiexec /x mysql-5.5.41.msi /uninstall
+shell> msiexec /x mysql-5.5.42.msi /uninstall
 
-   To install MySQL and configure a MySQL instance from the command
-   line, see Section 2.3.6.13, "MySQL Server Instance Config Wizard:
-   Creating an Instance from the Command Line."
+   To install MySQL and configure a MySQL instance from the
+   command line, see Section 2.3.6.13, "MySQL Server Instance
+   Config Wizard: Creating an Instance from the Command Line."
 
    For information on using MSI packages to install software
-   automatically using Group Policy, see How to use Group Policy to
-   remotely install software in Windows Server 2003
+   automatically using Group Policy, see How to use Group Policy
+   to remotely install software in Windows Server 2003
    (http://support.microsoft.com/kb/816102).
 
 2.3.5.3 Removing MySQL When Installed from the MSI Package
 
-   To uninstall a MySQL where you have used the MSI packages, you
-   must use the Add/Remove Programs tool within Control Panel. To do
-   this:
+   To uninstall a MySQL where you have used the MSI packages,
+   you must use the Add/Remove Programs tool within Control
+   Panel. To do this:
 
     1. Right-click the start menu and choose Control Panel.
 
-    2. If the Control Panel is set to category mode (you will see
-       Pick a category at the top of the Control Panel window),
-       double-click Add or Remove Programs. If the Control is set to
-       classic mode, double-click the Add or Remove Programs icon.
-
-    3. Find MySQL in the list of installed software. MySQL Server is
-       installed against major version numbers (MySQL 5.1, MySQL 5.5,
-       etc.). Select the version that you want to remove and click
-       Remove.
+    2. If the Control Panel is set to category mode (you will
+       see Pick a category at the top of the Control Panel
+       window), double-click Add or Remove Programs. If the
+       Control is set to classic mode, double-click the Add or
+       Remove Programs icon.
+
+    3. Find MySQL in the list of installed software. MySQL
+       Server is installed against major version numbers (MySQL
+       5.1, MySQL 5.5, etc.). Select the version that you want
+       to remove and click Remove.
 
     4. You will be prompted to confirm the removal. Click Yes to
        remove MySQL.
 
    When MySQL is removed using this method, only the installed
-   components are removed. Any database information (including the
-   tables and data), import or export files, log files, and binary
-   logs produced during execution are kept in their configured
-   location.
-
-   If you try to install MySQL again the information will be retained
-   and you will be prompted to enter the password configured with the
-   original installation.
+   components are removed. Any database information (including
+   the tables and data), import or export files, log files, and
+   binary logs produced during execution are kept in their
+   configured location.
+
+   If you try to install MySQL again the information will be
+   retained and you will be prompted to enter the password
+   configured with the original installation.
 
    If you want to delete MySQL completely:
 
@@ -1556,84 +2017,90 @@ shell> msiexec /x mysql-5.5.41.msi /unin
      * On Windows 7 and Windows Server 2008, the default data
        directory location is C:\ProgramData\Mysql.
        Note
-       The C:\ProgramData directory is hidden by default. You must
-       change your folder options to view the hidden file. Choose
-       Organize, Folder and search options, Show hidden folders.
+       The C:\ProgramData directory is hidden by default. You
+       must change your folder options to view the hidden file.
+       Choose Organize, Folder and search options, Show hidden
+       folders.
 
 2.3.6 MySQL Server Instance Configuration Wizard
 
-   The MySQL Server Instance Configuration Wizard helps automate the
-   process of configuring your server. It creates a custom MySQL
-   configuration file (my.ini or my.cnf) by asking you a series of
-   questions and then applying your responses to a template to
-   generate the configuration file that is tuned to your
-   installation.
-
-   The MySQL Server Instance Configuration Wizard is included with
-   the MySQL 5.5 server. The MySQL Server Instance Configuration
-   Wizard is only available for Windows.
+   The MySQL Server Instance Configuration Wizard helps automate
+   the process of configuring your server. It creates a custom
+   MySQL configuration file (my.ini or my.cnf) by asking you a
+   series of questions and then applying your responses to a
+   template to generate the configuration file that is tuned to
+   your installation.
+
+   The MySQL Server Instance Configuration Wizard is included
+   with the MySQL 5.5 server. The MySQL Server Instance
+   Configuration Wizard is only available for Windows.
 
 2.3.6.1 Starting the MySQL Server Instance Configuration Wizard
 
-   The MySQL Server Instance Configuration Wizard is normally started
-   as part of the installation process. You should only need to run
-   the MySQL Server Instance Configuration Wizard again when you need
-   to change the configuration parameters of your server.
+   The MySQL Server Instance Configuration Wizard is normally
+   started as part of the installation process. You should only
+   need to run the MySQL Server Instance Configuration Wizard
+   again when you need to change the configuration parameters of
+   your server.
 
    If you chose not to open a port prior to installing MySQL on
-   Windows Vista or newer, you can choose to use the MySQL Server
-   Configuration Wizard after installation. However, you must open a
-   port in the Windows Firewall. To do this see the instructions
-   given in Section 2.3.5.1.1, "Downloading and Starting the MySQL
-   Installation Wizard." Rather than opening a port, you also have
-   the option of adding MySQL as a program that bypasses the Windows
-   Firewall. One or the other option is sufficient---you need not do
-   both. Additionally, when running the MySQL Server Configuration
-   Wizard on Windows Vista or newer, ensure that you are logged in as
-   a user with administrative rights.
+   Windows Vista or newer, you can choose to use the MySQL
+   Server Configuration Wizard after installation. However, you
+   must open a port in the Windows Firewall. To do this see the
+   instructions given in Section 2.3.5.1.1, "Downloading and
+   Starting the MySQL Installation Wizard." Rather than opening
+   a port, you also have the option of adding MySQL as a program
+   that bypasses the Windows Firewall. One or the other option
+   is sufficient---you need not do both. Additionally, when
+   running the MySQL Server Configuration Wizard on Windows
+   Vista or newer, ensure that you are logged in as a user with
+   administrative rights.
    MySQL Server Instance Configuration Wizard
 
    You can launch the MySQL Configuration Wizard by clicking the
-   MySQL Server Instance Config Wizard entry in the MySQL section of
-   the Windows Start menu.
-
-   Alternatively, you can navigate to the bin directory of your MySQL
-   installation and launch the MySQLInstanceConfig.exe file directly.
+   MySQL Server Instance Config Wizard entry in the MySQL
+   section of the Windows Start menu.
 
-   The MySQL Server Instance Configuration Wizard places the my.ini
-   file in the installation directory for the MySQL server. This
-   helps associate configuration files with particular server
-   instances.
-
-   To ensure that the MySQL server knows where to look for the my.ini
-   file, an argument similar to this is passed to the MySQL server as
-   part of the service installation:
+   Alternatively, you can navigate to the bin directory of your
+   MySQL installation and launch the MySQLInstanceConfig.exe
+   file directly.
+
+   The MySQL Server Instance Configuration Wizard places the
+   my.ini file in the installation directory for the MySQL
+   server. This helps associate configuration files with
+   particular server instances.
+
+   To ensure that the MySQL server knows where to look for the
+   my.ini file, an argument similar to this is passed to the
+   MySQL server as part of the service installation:
 --defaults-file="C:\Program Files\MySQL\MySQL Server 5.5\my.ini"
 
-   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced with the
-   installation path to the MySQL Server. The --defaults-file option
-   instructs the MySQL server to read the specified file for
-   configuration options when it starts.
-
-   Apart from making changes to the my.ini file by running the MySQL
-   Server Instance Configuration Wizard again, you can modify it by
-   opening it with a text editor and making any necessary changes.
-   You can also modify the server configuration with the
-   http://www.mysql.com/products/administrator/ utility. For more
-   information about server configuration, see Section 5.1.3, "Server
-   Command Options."
+   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced
+   with the installation path to the MySQL Server. The
+   --defaults-file option instructs the MySQL server to read the
+   specified file for configuration options when it starts.
+
+   Apart from making changes to the my.ini file by running the
+   MySQL Server Instance Configuration Wizard again, you can
+   modify it by opening it with a text editor and making any
+   necessary changes. You can also modify the server
+   configuration with the
+   http://www.mysql.com/products/administrator/ utility. For
+   more information about server configuration, see Section
+   5.1.3, "Server Command Options."
 
    MySQL clients and utilities such as the mysql and mysqldump
    command-line clients are not able to locate the my.ini file
-   located in the server installation directory. To configure the
-   client and utility applications, create a new my.ini file in the
-   Windows installation directory (for example, C:\WINDOWS).
-
-   Under Windows Server 2003, Windows Server 2000, Windows XP, and
-   Windows Vista, MySQL Server Instance Configuration Wizard will
-   configure MySQL to work as a Windows service. To start and stop
-   MySQL you use the Services application that is supplied as part of
-   the Windows Administrator Tools.
+   located in the server installation directory. To configure
+   the client and utility applications, create a new my.ini file
+   in the Windows installation directory (for example,
+   C:\WINDOWS).
+
+   Under Windows Server 2003, Windows Server 2000, Windows XP,
+   and Windows Vista, MySQL Server Instance Configuration Wizard
+   will configure MySQL to work as a Windows service. To start
+   and stop MySQL you use the Services application that is
+   supplied as part of the Windows Administrator Tools.
 
 2.3.6.2 Choosing a Maintenance Option
 
@@ -1645,118 +2112,119 @@ shell> msiexec /x mysql-5.5.41.msi /unin
 
    To reconfigure an existing server, choose the Re-configure
    Instance option and click the Next button. Any existing
-   configuration file is not overwritten, but renamed (within the
-   same directory) using a timestamp (Windows) or sequential number
-   (Linux). To remove the existing server instance, choose the Remove
-   Instance option and click the Next button.
+   configuration file is not overwritten, but renamed (within
+   the same directory) using a timestamp (Windows) or sequential
+   number (Linux). To remove the existing server instance,
+   choose the Remove Instance option and click the Next button.
 
    If you choose the Remove Instance option, you advance to a
-   confirmation window. Click the Execute button. The MySQL Server
-   Configuration Wizard stops and removes the MySQL service, and then
-   deletes the configuration file. The server installation and its
-   data folder are not removed.
-
-   If you choose the Re-configure Instance option, you advance to the
-   Configuration Type dialog where you can choose the type of
-   installation that you wish to configure.
+   confirmation window. Click the Execute button. The MySQL
+   Server Configuration Wizard stops and removes the MySQL
+   service, and then deletes the configuration file. The server
+   installation and its data folder are not removed.
+
+   If you choose the Re-configure Instance option, you advance
+   to the Configuration Type dialog where you can choose the
+   type of installation that you wish to configure.
 
 2.3.6.3 Choosing a Configuration Type
 
-   When you start the MySQL Server Instance Configuration Wizard for
-   a new MySQL installation, or choose the Re-configure Instance
-   option for an existing installation, you advance to the
-   Configuration Type dialog.
-   MySQL Server Instance Configuration Wizard: Configuration Type
+   When you start the MySQL Server Instance Configuration Wizard
+   for a new MySQL installation, or choose the Re-configure
+   Instance option for an existing installation, you advance to
+   the Configuration Type dialog.
+   MySQL Server Instance Configuration Wizard: Configuration
+   Type
 
    There are two configuration types available: Detailed
    Configuration and Standard Configuration. The Standard
-   Configuration option is intended for new users who want to get
-   started with MySQL quickly without having to make many decisions
-   about server configuration. The Detailed Configuration option is
-   intended for advanced users who want more fine-grained control
-   over server configuration.
+   Configuration option is intended for new users who want to
+   get started with MySQL quickly without having to make many
+   decisions about server configuration. The Detailed
+   Configuration option is intended for advanced users who want
+   more fine-grained control over server configuration.
 
    If you are new to MySQL and need a server configured as a
-   single-user developer machine, the Standard Configuration should
-   suit your needs. Choosing the Standard Configuration option causes
-   the MySQL Configuration Wizard to set all configuration options
-   automatically with the exception of Service Options and Security
-   Options.
-
-   The Standard Configuration sets options that may be incompatible
-   with systems where there are existing MySQL installations. If you
-   have an existing MySQL installation on your system in addition to
-   the installation you wish to configure, the Detailed Configuration
-   option is recommended.
+   single-user developer machine, the Standard Configuration
+   should suit your needs. Choosing the Standard Configuration
+   option causes the MySQL Configuration Wizard to set all
+   configuration options automatically with the exception of
+   Service Options and Security Options.
+
+   The Standard Configuration sets options that may be
+   incompatible with systems where there are existing MySQL
+   installations. If you have an existing MySQL installation on
+   your system in addition to the installation you wish to
+   configure, the Detailed Configuration option is recommended.
 
    To complete the Standard Configuration, please refer to the
    sections on Service Options and Security Options in Section
-   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11, "The
-   Security Options Dialog," respectively.
+   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11,
+   "The Security Options Dialog," respectively.
 
 2.3.6.4 The Server Type Dialog
 
-   There are three different server types available to choose from.
-   The server type that you choose affects the decisions that the
-   MySQL Server Instance Configuration Wizard makes with regard to
-   memory, disk, and processor usage.
+   There are three different server types available to choose
+   from. The server type that you choose affects the decisions
+   that the MySQL Server Instance Configuration Wizard makes
+   with regard to memory, disk, and processor usage.
    MySQL Server Instance Configuration Wizard: Server Type
 
-     * Developer Machine: Choose this option for a typical desktop
-       workstation where MySQL is intended only for personal use. It
-       is assumed that many other desktop applications are running.
-       The MySQL server is configured to use minimal system
-       resources.
-
-     * Server Machine: Choose this option for a server machine where
-       the MySQL server is running alongside other server
-       applications such as FTP, email, and Web servers. The MySQL
-       server is configured to use a moderate portion of the system
-       resources.
+     * Developer Machine: Choose this option for a typical
+       desktop workstation where MySQL is intended only for
+       personal use. It is assumed that many other desktop
+       applications are running. The MySQL server is configured
+       to use minimal system resources.
+
+     * Server Machine: Choose this option for a server machine
+       where the MySQL server is running alongside other server
+       applications such as FTP, email, and Web servers. The
+       MySQL server is configured to use a moderate portion of
+       the system resources.
 
      * Dedicated MySQL Server Machine: Choose this option for a
-       server machine that is intended to run only the MySQL server.
-       It is assumed that no other applications are running. The
-       MySQL server is configured to use all available system
-       resources.
+       server machine that is intended to run only the MySQL
+       server. It is assumed that no other applications are
+       running. The MySQL server is configured to use all
+       available system resources.
 
    Note
 
-   By selecting one of the preconfigured configurations, the values
-   and settings of various options in your my.cnf or my.ini will be
-   altered accordingly. The default values and options as described
-   in the reference manual may therefore be different to the options
-   and values that were created during the execution of the
-   configuration wizard.
+   By selecting one of the preconfigured configurations, the
+   values and settings of various options in your my.cnf or
+   my.ini will be altered accordingly. The default values and
+   options as described in the reference manual may therefore be
+   different to the options and values that were created during
+   the execution of the configuration wizard.
 
 2.3.6.5 The Database Usage Dialog
 
    The Database Usage dialog enables you to indicate the storage
-   engines that you expect to use when creating MySQL tables. The
-   option you choose determines whether the InnoDB storage engine is
-   available and what percentage of the server resources are
-   available to InnoDB.
+   engines that you expect to use when creating MySQL tables.
+   The option you choose determines whether the InnoDB storage
+   engine is available and what percentage of the server
+   resources are available to InnoDB.
    MySQL Server Instance Configuration Wizard: Usage Dialog
 
-     * Multifunctional Database: This option enables both the InnoDB
-       and MyISAM storage engines and divides resources evenly
-       between the two. This option is recommended for users who use
-       both storage engines on a regular basis.
+     * Multifunctional Database: This option enables both the
+       InnoDB and MyISAM storage engines and divides resources
+       evenly between the two. This option is recommended for
+       users who use both storage engines on a regular basis.
 
      * Transactional Database Only: This option enables both the
-       InnoDB and MyISAM storage engines, but dedicates most server
-       resources to the InnoDB storage engine. This option is
-       recommended for users who use InnoDB almost exclusively and
-       make only minimal use of MyISAM.
+       InnoDB and MyISAM storage engines, but dedicates most
+       server resources to the InnoDB storage engine. This
+       option is recommended for users who use InnoDB almost
+       exclusively and make only minimal use of MyISAM.
 
      * Non-Transactional Database Only: This option disables the
        InnoDB storage engine completely and dedicates all server
        resources to the MyISAM storage engine. This option is
        recommended for users who do not use InnoDB.
 
-   The Configuration Wizard uses a template to generate the server
-   configuration file. The Database Usage dialog sets one of the
-   following option strings:
+   The Configuration Wizard uses a template to generate the
+   server configuration file. The Database Usage dialog sets one
+   of the following option strings:
 Multifunctional Database:        MIXED
 Transactional Database Only:     INNODB
 Non-Transactional Database Only: MYISAM
@@ -1782,209 +2250,225 @@ skip-innodb
 
 2.3.6.6 The InnoDB Tablespace Dialog
 
-   Some users may want to locate the InnoDB tablespace files in a
-   different location than the MySQL server data directory. Placing
-   the tablespace files in a separate location can be desirable if
-   your system has a higher capacity or higher performance storage
-   device available, such as a RAID storage system.
-   MySQL Server Instance Configuration Wizard: InnoDB Data Tablespace
-
-   To change the default location for the InnoDB tablespace files,
-   choose a new drive from the drop-down list of drive letters and
-   choose a new path from the drop-down list of paths. To create a
-   custom path, click the ... button.
-
-   If you are modifying the configuration of an existing server, you
-   must click the Modify button before you change the path. In this
-   situation you must move the existing tablespace files to the new
-   location manually before starting the server.
+   Some users may want to locate the InnoDB tablespace files in
+   a different location than the MySQL server data directory.
+   Placing the tablespace files in a separate location can be
+   desirable if your system has a higher capacity or higher
+   performance storage device available, such as a RAID storage
+   system.
+   MySQL Server Instance Configuration Wizard: InnoDB Data
+   Tablespace
+
+   To change the default location for the InnoDB tablespace
+   files, choose a new drive from the drop-down list of drive
+   letters and choose a new path from the drop-down list of
+   paths. To create a custom path, click the ... button.
+
+   If you are modifying the configuration of an existing server,
+   you must click the Modify button before you change the path.
+   In this situation you must move the existing tablespace files
+   to the new location manually before starting the server.
 
 2.3.6.7 The Concurrent Connections Dialog
 
    To prevent the server from running out of resources, it is
-   important to limit the number of concurrent connections to the
-   MySQL server that can be established. The Concurrent Connections
-   dialog enables you to choose the expected usage of your server,
-   and sets the limit for concurrent connections accordingly. It is
-   also possible to set the concurrent connection limit manually.
+   important to limit the number of concurrent connections to
+   the MySQL server that can be established. The Concurrent
+   Connections dialog enables you to choose the expected usage
+   of your server, and sets the limit for concurrent connections
+   accordingly. It is also possible to set the concurrent
+   connection limit manually.
    MySQL Server Instance Configuration Wizard: Connections
 
-     * Decision Support (DSS)/OLAP: Choose this option if your server
-       does not require a large number of concurrent connections. The
-       maximum number of connections is set at 100, with an average
-       of 20 concurrent connections assumed.
-
-     * Online Transaction Processing (OLTP): Choose this option if
-       your server requires a large number of concurrent connections.
-       The maximum number of connections is set at 500.
-
-     * Manual Setting: Choose this option to set the maximum number
-       of concurrent connections to the server manually. Choose the
-       number of concurrent connections from the drop-down box
-       provided, or enter the maximum number of connections into the
-       drop-down box if the number you desire is not listed.
+     * Decision Support (DSS)/OLAP: Choose this option if your
+       server does not require a large number of concurrent
+       connections. The maximum number of connections is set at
+       100, with an average of 20 concurrent connections
+       assumed.
+
+     * Online Transaction Processing (OLTP): Choose this option
+       if your server requires a large number of concurrent
+       connections. The maximum number of connections is set at
+       500.
+
+     * Manual Setting: Choose this option to set the maximum
+       number of concurrent connections to the server manually.
+       Choose the number of concurrent connections from the
+       drop-down box provided, or enter the maximum number of
+       connections into the drop-down box if the number you
+       desire is not listed.
 
 2.3.6.8 The Networking and Strict Mode Options Dialog
 
    Use the Networking Options dialog to enable or disable TCP/IP
    networking and to configure the port number that is used to
    connect to the MySQL server.
-   MySQL Server Instance Configuration Wizard: Network Configuration
+   MySQL Server Instance Configuration Wizard: Network
+   Configuration
 
    TCP/IP networking is enabled by default. To disable TCP/IP
-   networking, uncheck the box next to the Enable TCP/IP Networking
-   option.
+   networking, uncheck the box next to the Enable TCP/IP
+   Networking option.
 
-   Port 3306 is used by default. To change the port used to access
-   MySQL, choose a new port number from the drop-down box or type a
-   new port number directly into the drop-down box. If the port
-   number you choose is in use, you are prompted to confirm your
-   choice of port number.
-
-   Set the Server SQL Mode to either enable or disable strict mode.
-   Enabling strict mode (default) makes MySQL behave more like other
-   database management systems. If you run applications that rely on
-   MySQL's old "forgiving" behavior, make sure to either adapt those
-   applications or to disable strict mode. For more information about
-   strict mode, see Section 5.1.7, "Server SQL Modes."
+   Port 3306 is used by default. To change the port used to
+   access MySQL, choose a new port number from the drop-down box
+   or type a new port number directly into the drop-down box. If
+   the port number you choose is in use, you are prompted to
+   confirm your choice of port number.
+
+   Set the Server SQL Mode to either enable or disable strict
+   mode. Enabling strict mode (default) makes MySQL behave more
+   like other database management systems. If you run
+   applications that rely on MySQL's old "forgiving" behavior,
+   make sure to either adapt those applications or to disable
+   strict mode. For more information about strict mode, see
+   Section 5.1.7, "Server SQL Modes."
 
 2.3.6.9 The Character Set Dialog
 
    The MySQL server supports multiple character sets and it is
-   possible to set a default server character set that is applied to
-   all tables, columns, and databases unless overridden. Use the
-   Character Set dialog to change the default character set of the
-   MySQL server.
+   possible to set a default server character set that is
+   applied to all tables, columns, and databases unless
+   overridden. Use the Character Set dialog to change the
+   default character set of the MySQL server.
    MySQL Server Instance Configuration Wizard: Character Set
 
-     * Standard Character Set: Choose this option if you want to use
-       latin1 as the default server character set. latin1 is used for
-       English and many Western European languages.
-
-     * Best Support For Multilingualism: Choose this option if you
-       want to use utf8 as the default server character set. This is
-       a Unicode character set that can store characters from many
-       different languages.
-
-     * Manual Selected Default Character Set / Collation: Choose this
-       option if you want to pick the server's default character set
-       manually. Choose the desired character set from the provided
-       drop-down list.
+     * Standard Character Set: Choose this option if you want to
+       use latin1 as the default server character set. latin1 is
+       used for English and many Western European languages.
+
+     * Best Support For Multilingualism: Choose this option if
+       you want to use utf8 as the default server character set.
+       This is a Unicode character set that can store characters
+       from many different languages.
+
+     * Manual Selected Default Character Set / Collation: Choose
+       this option if you want to pick the server's default
+       character set manually. Choose the desired character set
+       from the provided drop-down list.
 
 2.3.6.10 The Service Options Dialog
 
    On Windows platforms, the MySQL server can be installed as a
-   Windows service. When installed this way, the MySQL server can be
-   started automatically during system startup, and even restarted
-   automatically by Windows in the event of a service failure.
-
-   The MySQL Server Instance Configuration Wizard installs the MySQL
-   server as a service by default, using the service name MySQL. If
-   you do not wish to install the service, uncheck the box next to
-   the Install As Windows Service option. You can change the service
-   name by picking a new service name from the drop-down box provided
-   or by entering a new service name into the drop-down box.
-   Note
-
-   Service names can include any legal character except forward (/)
-   or backward (\) slashes, and must be less than 256 characters
-   long.
+   Windows service. When installed this way, the MySQL server
+   can be started automatically during system startup, and even
+   restarted automatically by Windows in the event of a service
+   failure.
+
+   The MySQL Server Instance Configuration Wizard installs the
+   MySQL server as a service by default, using the service name
+   MySQL. If you do not wish to install the service, uncheck the
+   box next to the Install As Windows Service option. You can
+   change the service name by picking a new service name from
+   the drop-down box provided or by entering a new service name
+   into the drop-down box.
+   Note
+
+   Service names can include any legal character except forward
+   (/) or backward (\) slashes, and must be less than 256
+   characters long.
    Warning
 
-   If you are installing multiple versions of MySQL onto the same
-   machine, you must choose a different service name for each version
-   that you install. If you do not choose a different service for
-   each installed version then the service manager information will
-   be inconsistent and this will cause problems when you try to
-   uninstall a previous version.
-
-   If you have already installed multiple versions using the same
-   service name, you must manually edit the contents of the
-   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services parameters
-   within the Windows registry to update the association of the
-   service name with the correct server version.
-
-   Typically, when installing multiple versions you create a service
-   name based on the version information. For example, you might
-   install MySQL 5.x as mysql5, or specific versions such as MySQL
-   5.5.0 as mysql50500.
-
-   To install the MySQL server as a service but not have it started
-   automatically at startup, uncheck the box next to the Launch the
-   MySQL Server Automatically option.
+   If you are installing multiple versions of MySQL onto the
+   same machine, you must choose a different service name for
+   each version that you install. If you do not choose a
+   different service for each installed version then the service
+   manager information will be inconsistent and this will cause
+   problems when you try to uninstall a previous version.
+
+   If you have already installed multiple versions using the
+   same service name, you must manually edit the contents of the
+   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services
+   parameters within the Windows registry to update the
+   association of the service name with the correct server
+   version.
+
+   Typically, when installing multiple versions you create a
+   service name based on the version information. For example,
+   you might install MySQL 5.x as mysql5, or specific versions
+   such as MySQL 5.5.0 as mysql50500.
+
+   To install the MySQL server as a service but not have it
+   started automatically at startup, uncheck the box next to the
+   Launch the MySQL Server Automatically option.
 
 2.3.6.11 The Security Options Dialog
 
-   The content of the security options portion of the MySQL Server
-   Instance Configuration Wizard will depend on whether this is a new
-   installation, or modifying an existing installation.
+   The content of the security options portion of the MySQL
+   Server Instance Configuration Wizard will depend on whether
+   this is a new installation, or modifying an existing
+   installation.
 
      * Setting the root password for a new installation
-       It is strongly recommended that you set a root password for
-       your MySQL server, and the MySQL Server Instance Config Wizard
-       requires by default that you do so. If you do not wish to set
-       a root password, uncheck the box next to the Modify Security
-       Settings option.
+       It is strongly recommended that you set a root password
+       for your MySQL server, and the MySQL Server Instance
+       Config Wizard requires by default that you do so. If you
+       do not wish to set a root password, uncheck the box next
+       to the Modify Security Settings option.
        MySQL Server Instance Config Wizard: Security
 
-     * To set the root password, enter the desired password into both
-       the New root password and Confirm boxes.
+     * To set the root password, enter the desired password into
+       both the New root password and Confirm boxes.
        Setting the root password for an existing installation
        If you are modifying the configuration of an existing
-       configuration, or you are installing an upgrade and the MySQL
-       Server Instance Configuration Wizard has detected an existing
-       MySQL system, then you must enter the existing password for
-       root before changing the configuration information.
+       configuration, or you are installing an upgrade and the
+       MySQL Server Instance Configuration Wizard has detected
+       an existing MySQL system, then you must enter the
+       existing password for root before changing the
+       configuration information.
        MySQL Server Instance Config Wizard: Security (Existing
        Installation)
-       If you want to change the current root password, enter the
-       desired new password into both the New root password and
-       Confirm boxes.
-
-   To permit root logins from across the network, check the box next
-   to the Enable root access from remote machines option. This
-   decreases the security of your root account.
-
-   To create an anonymous user account, check the box next to the
-   Create An Anonymous Account option. Creating an anonymous account
-   can decrease server security and cause login and permission
-   difficulties. For this reason, it is not recommended.
+       If you want to change the current root password, enter
+       the desired new password into both the New root password
+       and Confirm boxes.
+
+   To permit root logins from across the network, check the box
+   next to the Enable root access from remote machines option.
+   This decreases the security of your root account.
+
+   To create an anonymous user account, check the box next to
+   the Create An Anonymous Account option. Creating an anonymous
+   account can decrease server security and cause login and
+   permission difficulties. For this reason, it is not
+   recommended.
 
 2.3.6.12 The Confirmation Dialog
 
-   The final dialog in the MySQL Server Instance Configuration Wizard
-   is the Confirmation Dialog. To start the configuration process,
-   click the Execute button. To return to a previous dialog, click
-   the Back button. To exit the MySQL Server Instance Configuration
-   Wizard without configuring the server, click the Cancel button.
+   The final dialog in the MySQL Server Instance Configuration
+   Wizard is the Confirmation Dialog. To start the configuration
+   process, click the Execute button. To return to a previous
+   dialog, click the Back button. To exit the MySQL Server
+   Instance Configuration Wizard without configuring the server,
+   click the Cancel button.
    MySQL Server Instance Configuration Wizard: Confirmation
 
    After you click the Execute button, the MySQL Server Instance
-   Configuration Wizard performs a series of tasks and displays the
-   progress onscreen as the tasks are performed.
+   Configuration Wizard performs a series of tasks and displays
+   the progress onscreen as the tasks are performed.
 
-   The MySQL Server Instance Configuration Wizard first determines
-   configuration file options based on your choices using a template
-   prepared by MySQL developers and engineers. This template is named
-   my-template.ini and is located in your server installation
-   directory.
-
-   The MySQL Configuration Wizard then writes these options to the
-   corresponding configuration file.
-
-   If you chose to create a service for the MySQL server, the MySQL
-   Server Instance Configuration Wizard creates and starts the
-   service. If you are reconfiguring an existing service, the MySQL
-   Server Instance Configuration Wizard restarts the service to apply
-   your configuration changes.
+   The MySQL Server Instance Configuration Wizard first
+   determines configuration file options based on your choices
+   using a template prepared by MySQL developers and engineers.
+   This template is named my-template.ini and is located in your
+   server installation directory.
+
+   The MySQL Configuration Wizard then writes these options to
+   the corresponding configuration file.
+
+   If you chose to create a service for the MySQL server, the
+   MySQL Server Instance Configuration Wizard creates and starts
+   the service. If you are reconfiguring an existing service,
+   the MySQL Server Instance Configuration Wizard restarts the
+   service to apply your configuration changes.
 
    If you chose to set a root password, the MySQL Configuration
-   Wizard connects to the server, sets your new root password, and
-   applies any other security settings you may have selected.
-
-   After the MySQL Server Instance Configuration Wizard has completed
-   its tasks, it displays a summary. Click the Finish button to exit
-   the MySQL Server Configuration Wizard.
+   Wizard connects to the server, sets your new root password,
+   and applies any other security settings you may have
+   selected.
+
+   After the MySQL Server Instance Configuration Wizard has
+   completed its tasks, it displays a summary. Click the Finish
+   button to exit the MySQL Server Configuration Wizard.
 
 2.3.6.13 MySQL Server Instance Config Wizard: Creating an Instance
 from the Command Line
@@ -1994,24 +2478,27 @@ from the Command Line
    automatically from the command line.
 
    To use the MySQL Server Instance Config Wizard on the command
-   line, you need to use the MySQLInstanceConfig.exe command that is
-   installed with MySQL in the bin directory within the installation
-   directory. MySQLInstanceConfig.exe takes a number of command-line
-   arguments the set the properties that would normally be selected
-   through the GUI interface, and then creates a new configuration
-   file (my.ini) by combining these selections with a template
-   configuration file to produce the working configuration file.
+   line, you need to use the MySQLInstanceConfig.exe command
+   that is installed with MySQL in the bin directory within the
+   installation directory. MySQLInstanceConfig.exe takes a
+   number of command-line arguments the set the properties that
+   would normally be selected through the GUI interface, and
+   then creates a new configuration file (my.ini) by combining
+   these selections with a template configuration file to
+   produce the working configuration file.
+
+   The main command line options are provided in the table
+   below. Some of the options are required, while some options
+   are optional.
 
-   The main command line options are provided in the table below.
-   Some of the options are required, while some options are optional.
-
-   Table 2.5 MySQL Server Instance Config Wizard Command Line Options
+   Table 2.5 MySQL Server Instance Config Wizard Command Line
+   Options
    Option Description
    Required Parameters
    -nPRODUCTNAME The name of the instance when installed
    -pPATH Path of the base directory for installation. This is
-   equivalent to the directory when using the basedir configuration
-   parameter
+   equivalent to the directory when using the basedir
+   configuration parameter
    -vVERSION The version tag to use for this installation
    Action to Perform
    -i Install an instance
@@ -2020,95 +2507,97 @@ from the Command Line
    -q Perform the operation quietly
    -lFILENAME Sae the installation progress in a logfile
    Config File to Use
-   -tFILENAME Path to the template config file that will be used to
-   generate the installed configuration file
+   -tFILENAME Path to the template config file that will be used
+   to generate the installed configuration file
    -cFILENAME Path to a config file to be generated
 
    The -t and -c options work together to set the configuration
    parameters for a new instance. The -t option specifies the
-   template configuration file to use as the basic configuration,
-   which are then merged with the configuration parameters generated
-   by the MySQL Server Instance Config Wizard into the configuration
-   file specified by the -c option.
+   template configuration file to use as the basic
+   configuration, which are then merged with the configuration
+   parameters generated by the MySQL Server Instance Config
+   Wizard into the configuration file specified by the -c
+   option.
 
    A sample template file, my-template.ini is provided in the
-   toplevel MySQL installation directory. The file contains elements
-   are replaced automatically by the MySQL Server Instance Config
-   Wizard during configuration.
+   toplevel MySQL installation directory. The file contains
+   elements are replaced automatically by the MySQL Server
+   Instance Config Wizard during configuration.
 
    If you specify a configuration file that already exists, the
-   existing configuration file will be saved in the file with the
-   original, with the date and time added. For example, the mysql.ini
-   will be copied to mysql 2009-10-27 1646.ini.bak.
+   existing configuration file will be saved in the file with
+   the original, with the date and time added. For example, the
+   mysql.ini will be copied to mysql 2009-10-27 1646.ini.bak.
 
-   The parameters that you can specify on the command line are listed
-   in the table below.
+   The parameters that you can specify on the command line are
+   listed in the table below.
 
    Table 2.6 MySQL Server Instance Config Wizard Parameters
    Parameter Description
    ServiceName=$ Specify the name of the service to be created
    AddBinToPath={yes | no} Specifies whether to add the binary
    directory of MySQL to the standard PATH environment variable
-   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the server
-   type. For more information, see Section 2.3.6.4, "The Server Type
-   Dialog"
+   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the
+   server type. For more information, see Section 2.3.6.4, "The
+   Server Type Dialog"
    DatabaseType={MIXED | INNODB | MYISAM} Specify the default
-   database type. For more information, see Section 2.3.6.5, "The
-   Database Usage Dialog"
+   database type. For more information, see Section 2.3.6.5,
+   "The Database Usage Dialog"
    ConnectionUsage={DSS | OLTP} Specify the type of connection
-   support, this automates the setting for the number of concurrent
-   connections (see the ConnectionCount parameter). For more
-   information, see Section 2.3.6.7, "The Concurrent Connections
-   Dialog"
-   ConnectionCount=# Specify the number of concurrent connections to
-   support. For more information, see Section 2.3.6.4, "The Server
-   Type Dialog"
-   SkipNetworking={yes | no} Specify whether network support should
-   be supported. Specifying yes disables network access altogether
+   support, this automates the setting for the number of
+   concurrent connections (see the ConnectionCount parameter).
+   For more information, see Section 2.3.6.7, "The Concurrent
+   Connections Dialog"
+   ConnectionCount=# Specify the number of concurrent
+   connections to support. For more information, see Section
+   2.3.6.4, "The Server Type Dialog"
+   SkipNetworking={yes | no} Specify whether network support
+   should be supported. Specifying yes disables network access
+   altogether
    Port=# Specify the network port number to use for network
    connections. For more information, see Section 2.3.6.8, "The
    Networking and Strict Mode Options Dialog"
-   StrictMode={yes | no} Specify whether to use the strict SQL mode.
-   For more information, see Section 2.3.6.8, "The Networking and
-   Strict Mode Options Dialog"
-   Charset=$ Specify the default character set. For more information,
-   see Section 2.3.6.9, "The Character Set Dialog"
+   StrictMode={yes | no} Specify whether to use the strict SQL
+   mode. For more information, see Section 2.3.6.8, "The
+   Networking and Strict Mode Options Dialog"
+   Charset=$ Specify the default character set. For more
+   information, see Section 2.3.6.9, "The Character Set Dialog"
    RootPassword=$ Specify the root password
    RootCurrentPassword=$ Specify the current root password then
    stopping or reconfiguring an existing service
    Note
 
-   When specifying options on the command line, you can enclose the
-   entire command-line option and the value you are specifying using
-   double quotation marks. This enables you to use spaces in the
-   options. For example, "-cC:\mysql.ini".
-
-   The following command installs a MySQL Server 5.5 instance from
-   the directory C:\Program Files\MySQL\MySQL Server 5.5 using the
-   service name MySQL55 and setting the root password to 1234.
+   When specifying options on the command line, you can enclose
+   the entire command-line option and the value you are
+   specifying using double quotation marks. This enables you to
+   use spaces in the options. For example, "-cC:\mysql.ini".
+
+   The following command installs a MySQL Server 5.5 instance
+   from the directory C:\Program Files\MySQL\MySQL Server 5.5
+   using the service name MySQL55 and setting the root password
+   to 1234.
 shell> MySQLInstanceConfig.exe -i -q "-lC:\mysql_install_log.txt" »
-   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -
-v5.5.41 »
-   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Datab
-aseType=MIXED »
-   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=123
-4
+   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -v
+5.5.42 »
+   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Databa
+seType=MIXED »
+   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=1234
 
    In the above example, a log file will be generated in
    mysql_install_log.txt containing the information about the
-   instance creation process. The log file generated by the above
-   example is shown below:
+   instance creation process. The log file generated by the
+   above example is shown below:
 Welcome to the MySQL Server Instance Configuration Wizard 1.0.16.0
 Date: 2009-10-27 17:07:21
 
 Installing service ...
 
 Product Name:         MySQL Server 5.5
-Version:              5.5.41
+Version:              5.5.42
 Installation Path:    C:\Program Files\MySQL\MySQL Server 5.5\
 
-Creating configuration file C:\mytest.ini using template my-template.
-ini.
+Creating configuration file C:\mytest.ini using template my-template.i
+ni.
 Options:
 DEVELOPMENT
 MIXED
@@ -2124,14 +2613,16 @@ datadir: "C:/Program Files/MySQL/MySQL S
 
 Creating Windows service entry.
 Service name: "MySQL55"
-Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --
-defaults-file="C:\mytest.ini" MySQL55.
+Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --d
+efaults-file="C:\mytest.ini" MySQL55.
 Windows service MySQL55 installed.
 
-   When using the command line, the return values in the following
-   table indicate an error performing the specified option.
+   When using the command line, the return values in the
+   following table indicate an error performing the specified
+   option.
 
-   Table 2.7 Return Value from MySQL Server Instance Config Wizard
+   Table 2.7 Return Value from MySQL Server Instance Config
+   Wizard
    Value                   Description
    2     Configuration template file cannot be found
    3     The Windows service entry cannot be created
@@ -2142,17 +2633,18 @@ Windows service MySQL55 installed.
    8     The configuration file cannot be written
    9     The Windows service entry cannot be removed
 
-   You can perform an installation of MySQL automatically using the
-   MSI package. For more information, see Section 2.3.5.2,
-   "Automating MySQL Installation on Microsoft Windows Using the MSI
-   Package."
+   You can perform an installation of MySQL automatically using
+   the MSI package. For more information, see Section 2.3.5.2,
+   "Automating MySQL Installation on Microsoft Windows Using the
+   MSI Package."
 
 2.3.7 Installing MySQL on Microsoft Windows Using a noinstall Zip
 Archive
 
-   Users who are installing from the noinstall package can use the
-   instructions in this section to manually install MySQL. The
-   process for installing MySQL from a Zip archive is as follows:
+   Users who are installing from the noinstall package can use
+   the instructions in this section to manually install MySQL.
+   The process for installing MySQL from a Zip archive is as
+   follows:
 
     1. Extract the archive to the desired install directory
 
@@ -2170,188 +2662,204 @@ Archive
 
    To install MySQL manually, do the following:
 
-    1. If you are upgrading from a previous version please refer to
-       Section 2.3.9, "Upgrading MySQL on Windows," before beginning
-       the upgrade process.
+    1. If you are upgrading from a previous version please refer
+       to Section 2.3.9, "Upgrading MySQL on Windows," before
+       beginning the upgrade process.
 
-    2. Make sure that you are logged in as a user with administrator
-       privileges.
+    2. Make sure that you are logged in as a user with
+       administrator privileges.
 
     3. Choose an installation location. Traditionally, the MySQL
-       server is installed in C:\mysql. The MySQL Installation Wizard
-       installs MySQL under C:\Program Files\MySQL. If you do not
-       install MySQL at C:\mysql, you must specify the path to the
-       install directory during startup or in an option file. See
-       Section 2.3.7.2, "Creating an Option File."
+       server is installed in C:\mysql. The MySQL Installation
+       Wizard installs MySQL under C:\Program Files\MySQL. If
+       you do not install MySQL at C:\mysql, you must specify
+       the path to the install directory during startup or in an
+       option file. See Section 2.3.7.2, "Creating an Option
+       File."
+       Note
+       The MySQL Installer installs MySQL under C:\Program
+       Files\MySQL.
 
     4. Extract the install archive to the chosen installation
-       location using your preferred Zip archive tool. Some tools may
-       extract the archive to a folder within your chosen
-       installation location. If this occurs, you can move the
-       contents of the subfolder into the chosen installation
-       location.
+       location using your preferred Zip archive tool. Some
+       tools may extract the archive to a folder within your
+       chosen installation location. If this occurs, you can
+       move the contents of the subfolder into the chosen
+       installation location.
 
 2.3.7.2 Creating an Option File
 
-   If you need to specify startup options when you run the server,
-   you can indicate them on the command line or place them in an
-   option file. For options that are used every time the server
-   starts, you may find it most convenient to use an option file to
-   specify your MySQL configuration. This is particularly true under
-   the following circumstances:
-
-     * The installation or data directory locations are different
-       from the default locations (C:\Program Files\MySQL\MySQL
-       Server 5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data).
-
-     * You need to tune the server settings, such as memory, cache,
-       or InnoDB configuration information.
-
-   When the MySQL server starts on Windows, it looks for option files
-   in several locations, such as the Windows directory, C:\, and the
-   MySQL installation directory (for the full list of locations, see
-   Section 4.2.6, "Using Option Files"). The Windows directory
-   typically is named something like C:\WINDOWS. You can determine
-   its exact location from the value of the WINDIR environment
-   variable using the following command:
+   If you need to specify startup options when you run the
+   server, you can indicate them on the command line or place
+   them in an option file. For options that are used every time
+   the server starts, you may find it most convenient to use an
+   option file to specify your MySQL configuration. This is
+   particularly true under the following circumstances:
+
+     * The installation or data directory locations are
+       different from the default locations (C:\Program
+       Files\MySQL\MySQL Server 5.5 and C:\Program
+       Files\MySQL\MySQL Server 5.5\data).
+
+     * You need to tune the server settings, such as memory,
+       cache, or InnoDB configuration information.
+
+   When the MySQL server starts on Windows, it looks for option
+   files in several locations, such as the Windows directory,
+   C:\, and the MySQL installation directory (for the full list
+   of locations, see Section 4.2.6, "Using Option Files"). The
+   Windows directory typically is named something like
+   C:\WINDOWS. You can determine its exact location from the
+   value of the WINDIR environment variable using the following
+   command:
 C:\> echo %WINDIR%
 
-   MySQL looks for options in each location first in the my.ini file,
-   and then in the my.cnf file. However, to avoid confusion, it is
-   best if you use only one file. If your PC uses a boot loader where
-   C: is not the boot drive, your only option is to use the my.ini
-   file. Whichever option file you use, it must be a plain text file.
-   Note
-
-   When using the MySQL Installer to install MySQL Server, it will
-   create the my.ini at the default location. And as of MySQL Server
-   5.5.27, the user running MySQL Installer is granted full
-   permissions to this new my.ini.
-
-   In other words, be sure that the MySQL Server user has permission
-   to read the my.ini file.
-
-   You can also make use of the example option files included with
-   your MySQL distribution; see Section 5.1.2, "Server Configuration
-   Defaults."
-
-   An option file can be created and modified with any text editor,
-   such as Notepad. For example, if MySQL is installed in E:\mysql
-   and the data directory is in E:\mydata\data, you can create an
-   option file containing a [mysqld] section to specify values for
-   the basedir and datadir options:
+   MySQL looks for options in each location first in the my.ini
+   file, and then in the my.cnf file. However, to avoid
+   confusion, it is best if you use only one file. If your PC
+   uses a boot loader where C: is not the boot drive, your only
+   option is to use the my.ini file. Whichever option file you
+   use, it must be a plain text file.
+   Note
+
+   When using the MySQL Installer to install MySQL Server, it
+   will create the my.ini at the default location. And as of
+   MySQL Server 5.5.27, the user running MySQL Installer is
+   granted full permissions to this new my.ini.
+
+   In other words, be sure that the MySQL Server user has
+   permission to read the my.ini file.
+
+   You can also make use of the example option files included
+   with your MySQL distribution; see Section 5.1.2, "Server
+   Configuration Defaults."
+
+   An option file can be created and modified with any text
+   editor, such as Notepad. For example, if MySQL is installed
+   in E:\mysql and the data directory is in E:\mydata\data, you
+   can create an option file containing a [mysqld] section to
+   specify values for the basedir and datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=E:/mydata/data
 
-   Note that Windows path names are specified in option files using
-   (forward) slashes rather than backslashes. If you do use
-   backslashes, double them:
+   Microsoft Windows path names are specified in option files
+   using (forward) slashes rather than backslashes. If you do
+   use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=E:\\mysql
 # set datadir to the location of your data directory
 datadir=E:\\mydata\\data
 
-   The rules for use of backslash in option file values are given in
-   Section 4.2.6, "Using Option Files."
+   The rules for use of backslash in option file values are
+   given in Section 4.2.6, "Using Option Files."
 
-   The data directory is located within the AppData directory for the
-   user running MySQL.
+   The data directory is located within the AppData directory
+   for the user running MySQL.
 
-   If you would like to use a data directory in a different location,
-   you should copy the entire contents of the data directory to the
-   new location. For example, if you want to use E:\mydata as the
-   data directory instead, you must do two things:
-
-    1. Move the entire data directory and all of its contents from
-       the default location (for example C:\Program Files\MySQL\MySQL
-       Server 5.5\data) to E:\mydata.
+   If you would like to use a data directory in a different
+   location, you should copy the entire contents of the data
+   directory to the new location. For example, if you want to
+   use E:\mydata as the data directory instead, you must do two
+   things:
+
+    1. Move the entire data directory and all of its contents
+       from the default location (for example C:\Program
+       Files\MySQL\MySQL Server 5.5\data) to E:\mydata.
 
     2. Use a --datadir option to specify the new data directory
        location each time you start the server.
 
 2.3.7.3 Selecting a MySQL Server Type
 
-   The following table shows the available servers for Windows in
-   MySQL 5.5.
+   The following table shows the available servers for Windows
+   in MySQL 5.5.
    Binary Description
    mysqld Optimized binary with named-pipe support
-   mysqld-debug Like mysqld, but compiled with full debugging and
-   automatic memory allocation checking
+   mysqld-debug Like mysqld, but compiled with full debugging
+   and automatic memory allocation checking
 
    All of the preceding binaries are optimized for modern Intel
    processors, but should work on any Intel i386-class or higher
    processor.
 
    Each of the servers in a distribution support the same set of
-   storage engines. The SHOW ENGINES statement displays which engines
-   a given server supports.
+   storage engines. The SHOW ENGINES statement displays which
+   engines a given server supports.
 
-   All Windows MySQL 5.5 servers have support for symbolic linking of
-   database directories.
+   All Windows MySQL 5.5 servers have support for symbolic
+   linking of database directories.
 
-   MySQL supports TCP/IP on all Windows platforms. MySQL servers on
-   Windows also support named pipes, if you start the server with the
-   --enable-named-pipe option. It is necessary to use this option
-   explicitly because some users have experienced problems with
-   shutting down the MySQL server when named pipes were used. The
-   default is to use TCP/IP regardless of platform because named
-   pipes are slower than TCP/IP in many Windows configurations.
+   MySQL supports TCP/IP on all Windows platforms. MySQL servers
+   on Windows also support named pipes, if you start the server
+   with the --enable-named-pipe option. It is necessary to use
+   this option explicitly because some users have experienced
+   problems with shutting down the MySQL server when named pipes
+   were used. The default is to use TCP/IP regardless of
+   platform because named pipes are slower than TCP/IP in many
+   Windows configurations.
 
 2.3.7.4 Starting the Server for the First Time
 
    This section gives a general overview of starting the MySQL
-   server. The following sections provide more specific information
-   for starting the MySQL server from the command line or as a
-   Windows service.
+   server. The following sections provide more specific
+   information for starting the MySQL server from the command
+   line or as a Windows service.
 
    The information here applies primarily if you installed MySQL
-   using the Noinstall version, or if you wish to configure and test
-   MySQL manually rather than with the GUI tools.
+   using the Noinstall version, or if you wish to configure and
+   test MySQL manually rather than with the GUI tools.
+   Note
+
+   The MySQL server will automatically start after using the
+   MySQL Installer, and the MySQL Notifier GUI can be used to
+   start/stop/restart at any time.
 
    The examples in these sections assume that MySQL is installed
-   under the default location of C:\Program Files\MySQL\MySQL Server
-   5.5. Adjust the path names shown in the examples if you have MySQL
-   installed in a different location.
-
-   Clients have two options. They can use TCP/IP, or they can use a
-   named pipe if the server supports named-pipe connections.
-
-   MySQL for Windows also supports shared-memory connections if the
-   server is started with the --shared-memory option. Clients can
-   connect through shared memory by using the --protocol=MEMORY
-   option.
+   under the default location of C:\Program Files\MySQL\MySQL
+   Server 5.5. Adjust the path names shown in the examples if
+   you have MySQL installed in a different location.
+
+   Clients have two options. They can use TCP/IP, or they can
+   use a named pipe if the server supports named-pipe
+   connections.
+
+   MySQL for Windows also supports shared-memory connections if
+   the server is started with the --shared-memory option.
+   Clients can connect through shared memory by using the
+   --protocol=MEMORY option.
 
    For information about which server binary to run, see Section
    2.3.7.3, "Selecting a MySQL Server Type."
 
-   Testing is best done from a command prompt in a console window (or
-   "DOS window"). In this way you can have the server display status
-   messages in the window where they are easy to see. If something is
-   wrong with your configuration, these messages make it easier for
-   you to identify and fix any problems.
+   Testing is best done from a command prompt in a console
+   window (or "DOS window"). In this way you can have the server
+   display status messages in the window where they are easy to
+   see. If something is wrong with your configuration, these
+   messages make it easier for you to identify and fix any
+   problems.
 
    To start the server, enter this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --console
 
    For a server that includes InnoDB support, you should see the
-   messages similar to those following as it starts (the path names
-   and sizes may differ):
+   messages similar to those following as it starts (the path
+   names and sizes may differ):
 InnoDB: The first specified datafile c:\ibdata\ibdata1 did not exist:
 InnoDB: a new database to be created!
 InnoDB: Setting file c:\ibdata\ibdata1 size to 209715200
 InnoDB: Database physically writes the file full: wait...
-InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile0 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile1 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile2 size to 31457280
 InnoDB: Doublewrite buffer not found: creating new
 InnoDB: Doublewrite buffer created
@@ -2360,151 +2868,170 @@ InnoDB: foreign key constraint system ta
 011024 10:58:25  InnoDB: Started
 
    When the server finishes its startup sequence, you should see
-   something like this, which indicates that the server is ready to
-   service client connections:
+   something like this, which indicates that the server is ready
+   to service client connections:
 mysqld: ready for connections
-Version: '5.5.41'  socket: ''  port: 3306
+Version: '5.5.42'  socket: ''  port: 3306
 
    The server continues to write to the console any further
-   diagnostic output it produces. You can open a new console window
-   in which to run client programs.
+   diagnostic output it produces. You can open a new console
+   window in which to run client programs.
 
-   If you omit the --console option, the server writes diagnostic
-   output to the error log in the data directory (C:\Program
-   Files\MySQL\MySQL Server 5.5\data by default). The error log is
-   the file with the .err extension, or may be specified by passing
-   in the --log-error option.
+   If you omit the --console option, the server writes
+   diagnostic output to the error log in the data directory
+   (C:\Program Files\MySQL\MySQL Server 5.5\data by default).
+   The error log is the file with the .err extension, and may be
+   set using the --log-error option.
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.10.2,
-   "Securing the Initial MySQL Accounts."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
 
 2.3.7.5 Starting MySQL from the Windows Command Line
 
-   The MySQL server can be started manually from the command line.
-   This can be done on any version of Windows.
+   The MySQL server can be started manually from the command
+   line. This can be done on any version of Windows.
+   Note
+
+   The MySQL Notifier GUI can also be used to start/stop/restart
+   the MySQL server.
 
-   To start the mysqld server from the command line, you should start
-   a console window (or "DOS window") and enter this command:
+   To start the mysqld server from the command line, you should
+   start a console window (or "DOS window") and enter this
+   command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
 
-   The path to mysqld may vary depending on the install location of
-   MySQL on your system.
+   The path to mysqld may vary depending on the install location
+   of MySQL on your system.
 
    You can stop the MySQL server by executing this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" -u root
- shutdown
+shutdown
 
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
-
-   If mysqld doesn't start, check the error log to see whether the
-   server wrote any messages there to indicate the cause of the
-   problem. By default, the error log is located in the C:\Program
-   Files\MySQL\MySQL Server 5.5\data directory. It is the file with a
-   suffix of .err, or may be specified by passing in the --log-error
-   option. Alternatively, you can try to start the server as mysqld
-   --console; in this case, you may get some useful information on
-   the screen that may help solve the problem.
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
 
-   The last option is to start mysqld with the --standalone and
-   --debug options. In this case, mysqld writes a log file
-   C:\mysqld.trace that should contain the reason why mysqld doesn't
-   start. See Section 24.4.3, "The DBUG Package."
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
+   Note
 
-   Use mysqld --verbose --help to display all the options that mysqld
-   supports.
+   Users in the MySQL grant system are wholly independent from
+   any login users under Microsoft Windows.
 
-2.3.7.6 Customizing the PATH for MySQL Tools
+   If mysqld doesn't start, check the error log to see whether
+   the server wrote any messages there to indicate the cause of
+   the problem. By default, the error log is located in the
+   C:\Program Files\MySQL\MySQL Server 5.5\data directory. It is
+   the file with a suffix of .err, or may be specified by
+   passing in the --log-error option. Alternatively, you can try
+   to start the server with the --console option; in this case,
+   the server may display some useful information on the screen
+   that will help solve the problem.
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
+   The last option is to start mysqld with the --standalone and
+   --debug options. In this case, mysqld writes a log file
+   C:\mysqld.trace that should contain the reason why mysqld
+   doesn't start. See Section 24.4.3, "The DBUG Package."
 
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
+   Use mysqld --verbose --help to display all the options that
+   mysqld supports.
 
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
+2.3.7.6 Customizing the PATH for MySQL Tools
 
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
+
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
+
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
+
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin)
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin)
        Note
-       There must be a semicolon separating this path from any values
-       present in this field.
-       Dismiss this dialogue, and each dialogue in turn, by clicking
-       OK until all of the dialogues that were opened have been
-       dismissed. You should now be able to invoke any MySQL
-       executable program by typing its name at the DOS prompt from
-       any directory on the system, without having to supply the
-       path. This includes the servers, the mysql client, and all
-       MySQL command-line utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       There must be a semicolon separating this path from any
+       values present in this field.
+       Dismiss this dialogue, and each dialogue in turn, by
+       clicking OK until all of the dialogues that were opened
+       have been dismissed. You should now be able to invoke any
+       MySQL executable program by typing its name at the DOS
+       prompt from any directory on the system, without having
+       to supply the path. This includes the servers, the mysql
+       client, and all MySQL command-line utilities such as
+       mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
 
 2.3.7.7 Starting MySQL as a Windows Service
 
-   On Windows, the recommended way to run MySQL is to install it as a
-   Windows service, so that MySQL starts and stops automatically when
-   Windows starts and stops. A MySQL server installed as a service
-   can also be controlled from the command line using NET commands,
-   or with the graphical Services utility. Generally, to install
-   MySQL as a Windows service you should be logged in using an
-   account that has administrator rights.
-
-   The Services utility (the Windows Service Control Manager) can be
-   found in the Windows Control Panel (under Administrative Tools on
-   Windows 2000, XP, Vista, and Server 2003). To avoid conflicts, it
-   is advisable to close the Services utility while performing server
-   installation or removal operations from the command line.
+   On Windows, the recommended way to run MySQL is to install it
+   as a Windows service, so that MySQL starts and stops
+   automatically when Windows starts and stops. A MySQL server
+   installed as a service can also be controlled from the
+   command line using NET commands, or with the graphical
+   Services utility. Generally, to install MySQL as a Windows
+   service you should be logged in using an account that has
+   administrator rights.
+   Note
+
+   The MySQL Notifier GUI can also be used to monitor the status
+   of the MySQL service.
+
+   The Services utility (the Windows Service Control Manager)
+   can be found in the Windows Control Panel (under
+   Administrative Tools on Windows 2000, XP, Vista, and Server
+   2003). To avoid conflicts, it is advisable to close the
+   Services utility while performing server installation or
+   removal operations from the command line.
 
 Installing the service
 
-   Before installing MySQL as a Windows service, you should first
-   stop the current server if it is running by using the following
-   command:
+   Before installing MySQL as a Windows service, you should
+   first stop the current server if it is running by using the
+   following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin"
           -u root shutdown
 
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
+
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
+   Note
+
+   Users in the MySQL grant system are wholly independent from
+   any login users under Windows.
 
    Install the server as a service using this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install
@@ -2512,284 +3039,308 @@ C:\> "C:\Program Files\MySQL\MySQL Serve
    The service-installation command does not start the server.
    Instructions for that are given later in this section.
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
-
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
-
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
-
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
+
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
+
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
+
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin), Note that there should be a semicolon separating
-       this path from any values present in this field. Dismiss this
-       dialogue, and each dialogue in turn, by clicking OK until all
-       of the dialogues that were opened have been dismissed. You
-       should now be able to invoke any MySQL executable program by
-       typing its name at the DOS prompt from any directory on the
-       system, without having to supply the path. This includes the
-       servers, the mysql client, and all MySQL command-line
-       utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin), and there should be a
+       semicolon separating this path from any values present in
+       this field. Dismiss this dialogue, and each dialogue in
+       turn, by clicking OK until all of the dialogues that were
+       opened have been dismissed. You should now be able to
+       invoke any MySQL executable program by typing its name at
+       the DOS prompt from any directory on the system, without
+       having to supply the path. This includes the servers, the
+       mysql client, and all MySQL command-line utilities such
+       as mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
 
-   The following additional arguments can be used when installing the
-   service:
+   The following additional arguments can be used when
+   installing the service:
 
      * You can specify a service name immediately following the
        --install option. The default service name is MySQL.
 
-     * If a service name is given, it can be followed by a single
-       option. By convention, this should be
-       --defaults-file=file_name to specify the name of an option
-       file from which the server should read options when it starts.
+     * If a service name is given, it can be followed by a
+       single option. By convention, this should be
+       --defaults-file=file_name to specify the name of an
+       option file from which the server should read options
+       when it starts.
        The use of a single option other than --defaults-file is
-       possible but discouraged. --defaults-file is more flexible
-       because it enables you to specify multiple startup options for
-       the server by placing them in the named option file.
+       possible but discouraged. --defaults-file is more
+       flexible because it enables you to specify multiple
+       startup options for the server by placing them in the
+       named option file.
 
-     * You can also specify a --local-service option following the
-       service name. This causes the server to run using the
+     * You can also specify a --local-service option following
+       the service name. This causes the server to run using the
        LocalService Windows account that has limited system
-       privileges. This account is available only for Windows XP or
-       newer. If both --defaults-file and --local-service are given
-       following the service name, they can be in any order.
-
-   For a MySQL server that is installed as a Windows service, the
-   following rules determine the service name and option files that
-   the server uses:
-
-     * If the service-installation command specifies no service name
-       or the default service name (MySQL) following the --install
-       option, the server uses the a service name of MySQL and reads
-       options from the [mysqld] group in the standard option files.
-
-     * If the service-installation command specifies a service name
-       other than MySQL following the --install option, the server
-       uses that service name. It reads options from the [mysqld]
-       group and the group that has the same name as the service in
-       the standard option files. This enables you to use the
-       [mysqld] group for options that should be used by all MySQL
-       services, and an option group with the service name for use by
-       the server installed with that service name.
+       privileges. This account is available only for Windows XP
+       or newer. If both --defaults-file and --local-service are
+       given following the service name, they can be in any
+       order.
+
+   For a MySQL server that is installed as a Windows service,
+   the following rules determine the service name and option
+   files that the server uses:
+
+     * If the service-installation command specifies no service
+       name or the default service name (MySQL) following the
+       --install option, the server uses the a service name of
+       MySQL and reads options from the [mysqld] group in the
+       standard option files.
+
+     * If the service-installation command specifies a service
+       name other than MySQL following the --install option, the
+       server uses that service name. It reads options from the
+       [mysqld] group and the group that has the same name as
+       the service in the standard option files. This enables
+       you to use the [mysqld] group for options that should be
+       used by all MySQL services, and an option group with the
+       service name for use by the server installed with that
+       service name.
 
      * If the service-installation command specifies a
        --defaults-file option after the service name, the server
-       reads options the same way as described in the previous item,
-       except that it reads options only from the named file and
-       ignores the standard option files.
+       reads options the same way as described in the previous
+       item, except that it reads options only from the named
+       file and ignores the standard option files.
 
    As a more complex example, consider the following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
           --install MySQL --defaults-file=C:\my-opts.cnf
 
    Here, the default service name (MySQL) is given after the
-   --install option. If no --defaults-file option had been given,
-   this command would have the effect of causing the server to read
-   the [mysqld] group from the standard option files. However,
-   because the --defaults-file option is present, the server reads
-   options from the [mysqld] option group, and only from the named
-   file.
+   --install option. If no --defaults-file option had been
+   given, this command would have the effect of causing the
+   server to read the [mysqld] group from the standard option
+   files. However, because the --defaults-file option is
+   present, the server reads options from the [mysqld] option
+   group, and only from the named file.
    Note
 
-   On Windows, if the server is started with the --defaults-file and
-   --install options, --install must be first. Otherwise, mysqld.exe
-   will attempt to start the MySQL server.
+   On Windows, if the server is started with the --defaults-file
+   and --install options, --install must be first. Otherwise,
+   mysqld.exe will attempt to start the MySQL server.
 
-   You can also specify options as Start parameters in the Windows
-   Services utility before you start the MySQL service.
+   You can also specify options as Start parameters in the
+   Windows Services utility before you start the MySQL service.
 
 Starting the service
 
    Once a MySQL server has been installed as a service, Windows
    starts the service automatically whenever Windows starts. The
-   service also can be started immediately from the Services utility,
-   or by using a NET START MySQL command. The NET command is not case
-   sensitive.
-
-   When run as a service, mysqld has no access to a console window,
-   so no messages can be seen there. If mysqld does not start, check
-   the error log to see whether the server wrote any messages there
-   to indicate the cause of the problem. The error log is located in
-   the MySQL data directory (for example, C:\Program
-   Files\MySQL\MySQL Server 5.5\data). It is the file with a suffix
-   of .err.
+   service also can be started immediately from the Services
+   utility, or by using a NET START MySQL command. The NET
+   command is not case sensitive.
+
+   When run as a service, mysqld has no access to a console
+   window, so no messages can be seen there. If mysqld does not
+   start, check the error log to see whether the server wrote
+   any messages there to indicate the cause of the problem. The
+   error log is located in the MySQL data directory (for
+   example, C:\Program Files\MySQL\MySQL Server 5.5\data). It is
+   the file with a suffix of .err.
 
    When a MySQL server has been installed as a service, and the
-   service is running, Windows stops the service automatically when
-   Windows shuts down. The server also can be stopped manually by
-   using the Services utility, the NET STOP MySQL command, or the
-   mysqladmin shutdown command.
+   service is running, Windows stops the service automatically
+   when Windows shuts down. The server also can be stopped
+   manually by using the Services utility, the NET STOP MySQL
+   command, or the mysqladmin shutdown command.
 
    You also have the choice of installing the server as a manual
    service if you do not wish for the service to be started
    automatically during the boot process. To do this, use the
    --install-manual option rather than the --install option:
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-m
-anual
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-ma
+nual
 
 Removing the service
 
-   To remove a server that is installed as a service, first stop it
-   if it is running by executing NET STOP MySQL. Then use the
+   To remove a server that is installed as a service, first stop
+   it if it is running by executing NET STOP MySQL. Then use the
    --remove option to remove it:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --remove
 
-   If mysqld is not running as a service, you can start it from the
-   command line. For instructions, see Section 2.3.7.5, "Starting
-   MySQL from the Windows Command Line."
-
-   Please see Section 2.3.8, "Troubleshooting a Microsoft Windows
-   MySQL Server Installation," if you encounter difficulties during
-   installation.
+   If mysqld is not running as a service, you can start it from
+   the command line. For instructions, see Section 2.3.7.5,
+   "Starting MySQL from the Windows Command Line."
+
+   If you encounter difficulties during installation. see
+   Section 2.3.8, "Troubleshooting a Microsoft Windows MySQL
+   Server Installation."
 
 2.3.7.8 Testing The MySQL Installation
 
-   You can test whether the MySQL server is working by executing any
-   of the following commands:
+   You can test whether the MySQL server is working by executing
+   any of the following commands:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow"
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root
-mysql
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root m
+ysql
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" version
- status proc
+status proc
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysql" test
 
-   If mysqld is slow to respond to TCP/IP connections from client
-   programs, there is probably a problem with your DNS. In this case,
-   start mysqld with the --skip-name-resolve option and use only
-   localhost and IP addresses in the Host column of the MySQL grant
-   tables.
-
-   You can force a MySQL client to use a named-pipe connection rather
-   than TCP/IP by specifying the --pipe or --protocol=PIPE option, or
-   by specifying . (period) as the host name. Use the --socket option
-   to specify the name of the pipe if you do not want to use the
-   default pipe name.
-
-   Note that if you have set a password for the root account, deleted
-   the anonymous account, or created a new user account, then to
-   connect to the MySQL server you must use the appropriate -u and -p
-   options with the commands shown previously. See Section 4.2.2,
-   "Connecting to the MySQL Server."
+   If mysqld is slow to respond to TCP/IP connections from
+   client programs, there is probably a problem with your DNS.
+   In this case, start mysqld with the --skip-name-resolve
+   option and use only localhost and IP addresses in the Host
+   column of the MySQL grant tables.
+
+   You can force a MySQL client to use a named-pipe connection
+   rather than TCP/IP by specifying the --pipe or
+   --protocol=PIPE option, or by specifying . (period) as the
+   host name. Use the --socket option to specify the name of the
+   pipe if you do not want to use the default pipe name.
+
+   If you have set a password for the root account, deleted the
+   anonymous account, or created a new user account, then to
+   connect to the MySQL server you must use the appropriate -u
+   and -p options with the commands shown previously. See
+   Section 4.2.2, "Connecting to the MySQL Server."
 
    For more information about mysqlshow, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information."
+   "mysqlshow --- Display Database, Table, and Column
+   Information."
 
 2.3.8 Troubleshooting a Microsoft Windows MySQL Server Installation
 
    When installing and running MySQL for the first time, you may
    encounter certain errors that prevent the MySQL server from
-   starting. The purpose of this section is to help you diagnose and
-   correct some of these errors.
+   starting. This section helps you diagnose and correct some of
+   these errors.
 
    Your first resource when troubleshooting server issues is the
    error log. The MySQL server uses the error log to record
-   information relevant to the error that prevents the server from
-   starting. The error log is located in the data directory specified
-   in your my.ini file. The default data directory location is
-   C:\Program Files\MySQL\MySQL Server 5.5\data, or
-   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008. The
-   C:\ProgramData directory is hidden by default. You need to change
-   your folder options to see the directory and contents. For more
-   information on the error log and understanding the content, see
-   Section 5.2.2, "The Error Log."
-
-   Another source of information regarding possible errors is the
-   console messages displayed when the MySQL service is starting. Use
-   the NET START MySQL command from the command line after installing
-   mysqld as a service to see any error messages regarding the
-   starting of the MySQL server as a service. See Section 2.3.7.7,
-   "Starting MySQL as a Windows Service."
-
-   The following examples show other common error messages you may
-   encounter when installing MySQL and starting the server for the
-   first time:
+   information relevant to the error that prevents the server
+   from starting. The error log is located in the data directory
+   specified in your my.ini file. The default data directory
+   location is C:\Program Files\MySQL\MySQL Server 5.5\data, or
+   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008.
+   The C:\ProgramData directory is hidden by default. You need
+   to change your folder options to see the directory and
+   contents. For more information on the error log and
+   understanding the content, see Section 5.2.2, "The Error
+   Log."
+
+   For information regarding possible errors, also consult the
+   console messages displayed when the MySQL service is
+   starting. Use the NET START MySQL command from the command
+   line after installing mysqld as a service to see any error
+   messages regarding the starting of the MySQL server as a
+   service. See Section 2.3.7.7, "Starting MySQL as a Windows
+   Service."
 
-     * If the MySQL server cannot find the mysql privileges database
-       or other critical files, you may see these messages:
+   The following examples show other common error messages you
+   might encounter when installing MySQL and starting the server
+   for the first time:
+
+     * If the MySQL server cannot find the mysql privileges
+       database or other critical files, it displays these
+       messages:
 System error 1067 has occurred.
-Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
-exist
+Fatal error: Can't open and lock privilege tables:
+Table 'mysql.user' doesn't exist
+
        These messages often occur when the MySQL base or data
        directories are installed in different locations than the
-       default locations (C:\Program Files\MySQL\MySQL Server 5.5 and
-       C:\Program Files\MySQL\MySQL Server 5.5\data, respectively).
-       This situation may occur when MySQL is upgraded and installed
-       to a new location, but the configuration file is not updated
-       to reflect the new location. In addition, there may be old and
-       new configuration files that conflict. Be sure to delete or
-       rename any old configuration files when upgrading MySQL.
+       default locations (C:\Program Files\MySQL\MySQL Server
+       5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data,
+       respectively).
+       This situation can occur when MySQL is upgraded and
+       installed to a new location, but the configuration file
+       is not updated to reflect the new location. In addition,
+       old and new configuration files might conflict. Be sure
+       to delete or rename any old configuration files when
+       upgrading MySQL.
        If you have installed MySQL to a directory other than
-       C:\Program Files\MySQL\MySQL Server 5.5, you need to ensure
-       that the MySQL server is aware of this through the use of a
-       configuration (my.ini) file. The my.ini file needs to be
-       located in your Windows directory, typically C:\WINDOWS. You
-       can determine its exact location from the value of the WINDIR
-       environment variable by issuing the following command from the
-       command prompt:
+       C:\Program Files\MySQL\MySQL Server 5.5, ensure that the
+       MySQL server is aware of this through the use of a
+       configuration (my.ini) file. Put the my.ini file in your
+       Windows directory, typically C:\WINDOWS. To determine its
+       exact location from the value of the WINDIR environment
+       variable, issue the following command from the command
+       prompt:
 C:\> echo %WINDIR%
-       An option file can be created and modified with any text
-       editor, such as Notepad. For example, if MySQL is installed in
-       E:\mysql and the data directory is D:\MySQLdata, you can
-       create the option file and set up a [mysqld] section to
-       specify values for the basedir and datadir options:
+
+       You can create or modify an option file with any text
+       editor, such as Notepad. For example, if MySQL is
+       installed in E:\mysql and the data directory is
+       D:\MySQLdata, you can create the option file and set up a
+       [mysqld] section to specify values for the basedir and
+       datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=D:/MySQLdata
-       Note that Windows path names are specified in option files
-       using (forward) slashes rather than backslashes. If you do use
-       backslashes, double them:
+
+       Microsoft Windows path names are specified in option
+       files using (forward) slashes rather than backslashes. If
+       you do use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=C:\\Program Files\\MySQL\\MySQL Server 5.5
 # set datadir to the location of your data directory
 datadir=D:\\MySQLdata
-       The rules for use of backslash in option file values are given
-       in Section 4.2.6, "Using Option Files."
-       If you change the datadir value in your MySQL configuration
-       file, you must move the contents of the existing MySQL data
-       directory before restarting the MySQL server.
+
+       The rules for use of backslash in option file values are
+       given in Section 4.2.6, "Using Option Files."
+       If you change the datadir value in your MySQL
+       configuration file, you must move the contents of the
+       existing MySQL data directory before restarting the MySQL
+       server.
        See Section 2.3.7.2, "Creating an Option File."
 
-     * If you reinstall or upgrade MySQL without first stopping and
-       removing the existing MySQL service and install MySQL using
-       the MySQL Configuration Wizard, you may see this error:
+     * If you reinstall or upgrade MySQL without first stopping
+       and removing the existing MySQL service and install MySQL
+       using the MySQL Installer, you might see this error:
 Error: Cannot create Windows service for MySql. Error: 0
-       This occurs when the Configuration Wizard tries to install the
-       service and finds an existing service with the same name.
-       One solution to this problem is to choose a service name other
-       than mysql when using the configuration wizard. This enables
-       the new service to be installed correctly, but leaves the
-       outdated service in place. Although this is harmless, it is
-       best to remove old services that are no longer in use.
+
+       This occurs when the Configuration Wizard tries to
+       install the service and finds an existing service with
+       the same name.
+       One solution to this problem is to choose a service name
+       other than mysql when using the configuration wizard.
+       This enables the new service to be installed correctly,
+       but leaves the outdated service in place. Although this
+       is harmless, it is best to remove old services that are
+       no longer in use.
        To permanently remove the old mysql service, execute the
-       following command as a user with administrative privileges, on
-       the command-line:
+       following command as a user with administrative
+       privileges, on the command line:
 C:\> sc delete mysql
 [SC] DeleteService SUCCESS
+
        If the sc utility is not available for your version of
        Windows, download the delsrv utility from
-       http://www.microsoft.com/windows2000/techinfo/reskit/tools/exi
-       sting/delsrv-o.asp and use the delsrv mysql syntax.
+       http://www.microsoft.com/windows2000/techinfo/reskit/tool
+       s/existing/delsrv-o.asp and use the delsrv mysql syntax.
 
 2.3.9 Upgrading MySQL on Windows
 
@@ -2799,93 +3350,135 @@ C:\> sc delete mysql
        information on upgrading MySQL that is not specific to
        Windows.
 
-    2. You should always back up your current MySQL installation
-       before performing an upgrade. See Section 7.2, "Database
-       Backup Methods."
+    2. Always back up your current MySQL installation before
+       performing an upgrade. See Section 7.2, "Database Backup
+       Methods."
 
     3. Download the latest Windows distribution of MySQL from
        http://dev.mysql.com/downloads/.
 
-    4. Before upgrading MySQL, you must stop the server. If the
-       server is installed as a service, stop the service with the
+    4. Before upgrading MySQL, stop the server. If the server is
+       installed as a service, stop the service with the
        following command from the command prompt:
 C:\> NET STOP MySQL
+
        If you are not running the MySQL server as a service, use
        mysqladmin to stop it. For example, before upgrading from
-       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as follows:
+       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as
+       follows:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.1\bin\mysqladmin" -u root
- shutdown
+shutdown
+
        Note
-       If the MySQL root user account has a password, you need to
-       invoke mysqladmin with the -p option and enter the password
-       when prompted.
-
-    5. Before upgrading a MySQL service from MySQL 5.1 to 5.5, you
-       should stop the 5.1 server and remove the instance. Run the
-       MySQL Instance Configuration Wizard, choose the Remove
-       Instance option and in the next screen, confirm removal. After
-       that it is safe to uninstall MySQL Server 5.1.
-
-    6. Before upgrading to MySQL 5.5 from a version previous to
-       4.1.5, or from a version of MySQL installed from a Zip archive
-       to a version of MySQL installed with the MySQL Installation
-       Wizard, you must first manually remove the previous
-       installation and MySQL service (if the server is installed as
-       a service).
+       If the MySQL root user account has a password, invoke
+       mysqladmin with the -p option and enter the password when
+       prompted.
+
+    5. Before upgrading to MySQL 5.5 from a version previous to
+       4.1.5, or from a version of MySQL installed from a Zip
+       archive to a version of MySQL installed with the MySQL
+       Installation Wizard, you must first manually remove the
+       previous installation and MySQL service (if the server is
+       installed as a service).
        To remove the MySQL service, use the following command:
 C:\> C:\mysql\bin\mysqld --remove
+
        If you do not remove the existing service, the MySQL
-       Installation Wizard may fail to properly install the new MySQL
-       service.
+       Installation Wizard may fail to properly install the new
+       MySQL service.
 
-    7. If you are using the MySQL Installation Wizard, start the
+    6. If you are using the MySQL Installer, start it as
+       described in Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+       If you are using the MySQL Installation Wizard, start the
        wizard as described in Section 2.3.5.1, "Using the MySQL
        Installation Wizard."
 
-    8. If you are installing MySQL from a Zip archive, extract the
-       archive. You may either overwrite your existing MySQL
-       installation (usually located at C:\mysql), or install it into
-       a different directory, such as C:\mysql5. Overwriting the
-       existing installation is recommended.
-
-    9. If you were running MySQL as a Windows service and you had to
-       remove the service earlier in this procedure, reinstall the
-       service. (See Section 2.3.7.7, "Starting MySQL as a Windows
-       Service.")
-   10. Restart the server. For example, use NET START MySQL if you
-       run MySQL as a service, or invoke mysqld directly otherwise.
-   11. As Administrator, run mysql_upgrade to check your tables,
-       attempt to repair them if necessary, and update your grant
-       tables if they have changed so that you can take advantage of
-       any new capabilities. See Section 4.4.7, "mysql_upgrade ---
-       Check and Upgrade MySQL Tables."
-   12. If you encounter errors, see Section 2.3.8, "Troubleshooting a
-       Microsoft Windows MySQL Server Installation."
+    7. If you are upgrading MySQL from a Zip archive, extract
+       the archive. You may either overwrite your existing MySQL
+       installation (usually located at C:\mysql), or install it
+       into a different directory, such as C:\mysql5.
+       Overwriting the existing installation is recommended.
+       However, for upgrades (as opposed to installing for the
+       first time), you must remove the data directory from your
+       existing MySQL installation to avoid replacing your
+       current data files. To do so, follow these steps:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Rezip the Zip archive
+         d. Unzip the modified Zip archive on top of your
+            existing installation
+       Alternatively:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Move the data directory from the current MySQL
+            installation to the location of the just-removed
+            data directory
+         d. Remove the current MySQL installation
+         e. Move the unzipped installation to the location of
+            the just-removed installation
+
+    8. If you were running MySQL as a Windows service and you
+       had to remove the service earlier in this procedure,
+       reinstall the service. (See Section 2.3.7.7, "Starting
+       MySQL as a Windows Service.")
+
+    9. Restart the server. For example, use NET START MySQL if
+       you run MySQL as a service, or invoke mysqld directly
+       otherwise.
+   10. As Administrator, run mysql_upgrade to check your tables,
+       attempt to repair them if necessary, and update your
+       grant tables if they have changed so that you can take
+       advantage of any new capabilities. See Section 4.4.7,
+       "mysql_upgrade --- Check and Upgrade MySQL Tables."
+   11. If you encounter errors, see Section 2.3.8,
+       "Troubleshooting a Microsoft Windows MySQL Server
+       Installation."
 
 2.3.10 Windows Postinstallation Procedures
 
-   On Windows, you need not create the data directory and the grant
-   tables. MySQL Windows distributions include the grant tables with
-   a set of preinitialized accounts in the mysql database under the
-   data directory. Regarding passwords, if you installed MySQL using
-   the Windows Installation Wizard, you may have already assigned
-   passwords to the accounts. (See Section 2.3.5.1, "Using the MySQL
-   Installation Wizard.") Otherwise, use the password-assignment
-   procedure given in Section 2.10.2, "Securing the Initial MySQL
+   GUI tools exist that perform most of the tasks described
+   below, including:
+
+     * MySQL Installer: Used to install and upgrade MySQL
+       products.
+
+     * MySQL Workbench: Manages the MySQL server and edits SQL
+       queries.
+
+     * MySQL Notifier: Starts, stops, or restarts the MySQL
+       server, and monitors its status.
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html):
+       Edits MySQL data with Microsoft Excel.
+
+   On Windows, you need not create the data directory and the
+   grant tables. MySQL Windows distributions include the grant
+   tables with a set of preinitialized accounts in the mysql
+   database under the data directory. Regarding passwords, if
+   you installed MySQL using the MySQL Installer, you may have
+   already assigned passwords to the accounts. (See Section
+   2.3.3, "Installing MySQL on Microsoft Windows Using MySQL
+   Installer.") Otherwise, use the password-assignment procedure
+   given in Section 2.10.2, "Securing the Initial MySQL
    Accounts."
 
-   Before setting up passwords, you might want to try running some
-   client programs to make sure that you can connect to the server
-   and that it is operating properly. Make sure that the server is
-   running (see Section 2.3.7.4, "Starting the Server for the First
-   Time"), and then issue the following commands to verify that you
-   can retrieve information from the server. You may need to specify
-   directory different from C:\mysql\bin on the command line. If you
-   used the Windows Installation Wizard, the default directory is
-   C:\Program Files\MySQL\MySQL Server 5.5, and the mysql and
-   mysqlshow client programs are in C:\Program Files\MySQL\MySQL
-   Server 5.5\bin. See Section 2.3.5.1, "Using the MySQL Installation
-   Wizard," for more information.
+   Before setting up passwords, you might want to try running
+   some client programs to make sure that you can connect to the
+   server and that it is operating properly. Make sure that the
+   server is running (see Section 2.3.7.4, "Starting the Server
+   for the First Time"), and then issue the following commands
+   to verify that you can retrieve information from the server.
+   You may need to specify directory different from C:\mysql\bin
+   on the command line. If you installed MySQL using MySQL
+   Installer, the default directory is C:\Program
+   Files\MySQL\MySQL Server 5.5, and the mysql and mysqlshow
+   client programs are in C:\Program Files\MySQL\MySQL Server
+   5.5\bin. See Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer," for more information.
 
    Use mysqlshow to see what databases exist:
 C:\> C:\mysql\bin\mysqlshow
@@ -2897,20 +3490,22 @@ C:\> C:\mysql\bin\mysqlshow
 | test               |
 +--------------------+
 
-   The list of installed databases may vary, but will always include
-   the minimum of mysql and information_schema. In most cases, the
-   test database will also be installed automatically.
-
-   The preceding command (and commands for other MySQL programs such
-   as mysql) may not work if the correct MySQL account does not
-   exist. For example, the program may fail with an error, or you may
-   not be able to view all databases. If you installed using the MSI
-   packages and used the MySQL Server Instance Config Wizard, then
-   the root user will have been created automatically with the
-   password you supplied. In this case, you should use the -u root
-   and -p options. (You will also need to use the -u root and -p
-   options if you have already secured the initial MySQL accounts.)
-   With -p, you will be prompted for the root password. For example:
+   The list of installed databases may vary, but will always
+   include the minimum of mysql and information_schema. In most
+   cases, the test database will also be installed
+   automatically.
+
+   The preceding command (and commands for other MySQL programs
+   such as mysql) may not work if the correct MySQL account does
+   not exist. For example, the program may fail with an error,
+   or you may not be able to view all databases. If you
+   installed MySQL using MySQL Installer, then the root user
+   will have been created automatically with the password you
+   supplied. In this case, you should use the -u root and -p
+   options. (You will also need to use the -u root and -p
+   options if you have already secured the initial MySQL
+   accounts.) With -p, you will be prompted for the root
+   password. For example:
 C:\> C:\mysql\bin\mysqlshow -u root -p
 Enter password: (enter root password here)
 +--------------------+
@@ -2921,8 +3516,8 @@ Enter password: (enter root password her
 | test               |
 +--------------------+
 
-   If you specify a database name, mysqlshow displays a list of the
-   tables within the database:
+   If you specify a database name, mysqlshow displays a list of
+   the tables within the database:
 C:\> C:\mysql\bin\mysqlshow mysql
 Database: mysql
 +---------------------------+
@@ -2950,8 +3545,8 @@ Database: mysql
 | user                      |
 +---------------------------+
 
-   Use the mysql program to select information from a table in the
-   mysql database:
+   Use the mysql program to select information from a table in
+   the mysql database:
 C:\> C:\mysql\bin\mysql -e "SELECT Host,Db,User FROM mysql.db"
 +------+--------+------+
 | host | db     | user |
@@ -2960,11 +3555,12 @@ C:\> C:\mysql\bin\mysql -e "SELECT Host,
 | %    | test_% |      |
 +------+--------+------+
 
-   For more information about mysqlshow and mysql, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information,"
-   and Section 4.5.1, "mysql --- The MySQL Command-Line Tool."
-
-   If you are running a version of Windows that supports services,
-   you can set up the MySQL server to run automatically when Windows
-   starts. See Section 2.3.7.7, "Starting MySQL as a Windows
-   Service."
+   For more information about mysqlshow and mysql, see Section
+   4.5.6, "mysqlshow --- Display Database, Table, and Column
+   Information," and Section 4.5.1, "mysql --- The MySQL
+   Command-Line Tool."
+
+   If you are running a version of Windows that supports
+   services, you can set up the MySQL server to run
+   automatically when Windows starts. See Section 2.3.7.7,
+   "Starting MySQL as a Windows Service."
diff -pruN 5.5.40-1/extra/replace.c 5.5.42-1/extra/replace.c
--- 5.5.40-1/extra/replace.c	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/replace.c	2015-01-06 20:39:40.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -1020,7 +1020,7 @@ FILE *in,*out;
   updated=retain=0;
   reset_buffer();
 
-  while ((error=fill_buffer_retaining(fileno(in),retain)) > 0)
+  while ((error=fill_buffer_retaining(my_fileno(in),retain)) > 0)
   {
     end_of_line=buffer ;
     buffer[bufbytes]=0;			/* Sentinel  */
diff -pruN 5.5.40-1/extra/yassl/examples/client/client.cpp 5.5.42-1/extra/yassl/examples/client/client.cpp
--- 5.5.40-1/extra/yassl/examples/client/client.cpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/examples/client/client.cpp	2015-01-06 20:39:40.000000000 +0000
@@ -18,6 +18,10 @@
 
 /* client.cpp  */
 
+// takes an optional command line argument of cipher list to make scripting
+// easier
+
+
 #include "../../testsuite/test.hpp"
 
 //#define TEST_RESUME
@@ -73,11 +77,16 @@ void client_test(void* args)
 #ifdef NON_BLOCKING
     tcp_set_nonblocking(sockfd);
 #endif
-
     SSL_METHOD* method = TLSv1_client_method();
     SSL_CTX*    ctx = SSL_CTX_new(method);
 
     set_certs(ctx);
+    if (argc >= 2) {
+        printf("setting cipher list to %s\n", argv[1]);
+        if (SSL_CTX_set_cipher_list(ctx, argv[1]) != SSL_SUCCESS) {
+            ClientError(ctx, NULL, sockfd, "set_cipher_list error\n");
+        }
+    }
     SSL* ssl = SSL_new(ctx);
 
     SSL_set_fd(ssl, sockfd);
diff -pruN 5.5.40-1/extra/yassl/examples/server/server.cpp 5.5.42-1/extra/yassl/examples/server/server.cpp
--- 5.5.40-1/extra/yassl/examples/server/server.cpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/examples/server/server.cpp	2015-01-06 20:39:40.000000000 +0000
@@ -18,6 +18,9 @@
 
 /* server.cpp */
 
+// takes 2 optional command line argument to make scripting
+// if the first  command line argument is 'n' client auth is disabled
+// if the second command line argument is 'd' DSA certs are used instead of RSA
 
 #include "../../testsuite/test.hpp"
 
@@ -69,6 +72,9 @@ THREAD_RETURN YASSL_API server_test(void
     char**   argv     = 0;
 
     set_args(argc, argv, *static_cast<func_args*>(args));
+#ifdef SERVER_READY_FILE
+    set_file_ready("server_ready", *static_cast<func_args*>(args));
+#endif
     tcp_accept(sockfd, clientfd, *static_cast<func_args*>(args));
 
     tcp_close(sockfd);
@@ -77,8 +83,21 @@ THREAD_RETURN YASSL_API server_test(void
     SSL_CTX*    ctx = SSL_CTX_new(method);
 
     //SSL_CTX_set_cipher_list(ctx, "RC4-SHA:RC4-MD5");
-    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
-    set_serverCerts(ctx);
+    
+    // should we disable client auth
+    if (argc >= 2 && argv[1][0] == 'n')
+        printf("disabling client auth\n");
+    else
+        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
+
+    // are we using DSA certs
+    if (argc >= 3 && argv[2][0] == 'd') {
+        printf("using DSA certs\n");
+        set_dsaServerCerts(ctx);
+    }
+    else {
+        set_serverCerts(ctx);
+    }
     DH* dh = set_tmpDH(ctx);
 
     SSL* ssl = SSL_new(ctx);
diff -pruN 5.5.40-1/extra/yassl/include/openssl/ssl.h 5.5.42-1/extra/yassl/include/openssl/ssl.h
--- 5.5.40-1/extra/yassl/include/openssl/ssl.h	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/include/openssl/ssl.h	2015-01-06 20:39:40.000000000 +0000
@@ -35,7 +35,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "2.3.4"
+#define YASSL_VERSION "2.3.7"
 
 
 #if defined(__cplusplus)
diff -pruN 5.5.40-1/extra/yassl/include/yassl_int.hpp 5.5.42-1/extra/yassl/include/yassl_int.hpp
--- 5.5.40-1/extra/yassl/include/yassl_int.hpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/include/yassl_int.hpp	2015-01-06 20:39:40.000000000 +0000
@@ -107,6 +107,25 @@ enum AcceptState {
 };
 
 
+// track received messages to explicitly disallow duplicate messages
+struct RecvdMessages {
+    uint8 gotClientHello_;
+    uint8 gotServerHello_;
+    uint8 gotCert_;
+    uint8 gotServerKeyExchange_;
+    uint8 gotCertRequest_;
+    uint8 gotServerHelloDone_;
+    uint8 gotCertVerify_;
+    uint8 gotClientKeyExchange_;
+    uint8 gotFinished_;
+    RecvdMessages() : gotClientHello_(0), gotServerHello_(0), gotCert_(0),
+                      gotServerKeyExchange_(0), gotCertRequest_(0),
+                      gotServerHelloDone_(0), gotCertVerify_(0),
+                      gotClientKeyExchange_(0), gotFinished_(0)
+                    {} 
+};
+
+
 // combines all states
 class States {
     RecordLayerState recordLayer_;
@@ -115,6 +134,7 @@ class States {
     ServerState      serverState_;
     ConnectState     connectState_;
     AcceptState      acceptState_;
+    RecvdMessages    recvdMessages_;
     char             errorString_[MAX_ERROR_SZ];
     YasslError       what_;
 public:
@@ -137,6 +157,7 @@ public:
     AcceptState&      UseAccept();
     char*             useString();
     void              SetError(YasslError);
+    int               SetMessageRecvd(HandShakeType);
 private:
     States(const States&);              // hide copy
     States& operator=(const States&);   // and assign
diff -pruN 5.5.40-1/extra/yassl/README 5.5.42-1/extra/yassl/README
--- 5.5.40-1/extra/yassl/README	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/README	2015-01-06 20:39:40.000000000 +0000
@@ -12,6 +12,25 @@ before calling SSL_new();
 
 *** end Note ***
 
+yaSSL Release notes, version 2.3.7 (12/10/2014)
+    This release of yaSSL fixes the potential to process duplicate handshake
+    messages by explicitly marking/checking received handshake messages.
+
+yaSSL Release notes, version 2.3.6 (11/25/2014)
+
+    This release of yaSSL fixes some valgrind warnings/errors including
+    uninitialized reads and off by one index errors induced from fuzzing
+    the handshake.  These were reported by Oracle. 
+
+yaSSL Release notes, version 2.3.5 (9/29/2014)
+
+    This release of yaSSL fixes an RSA Padding check vulnerability reported by
+    Intel Security Advanced Threat Research team
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
 yaSSL Release notes, version 2.3.4 (8/15/2014)
 
     This release of yaSSL adds checking to the input_buffer class itself.
diff -pruN 5.5.40-1/extra/yassl/src/yassl_imp.cpp 5.5.42-1/extra/yassl/src/yassl_imp.cpp
--- 5.5.40-1/extra/yassl/src/yassl_imp.cpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/src/yassl_imp.cpp	2015-01-06 20:39:40.000000000 +0000
@@ -242,6 +242,7 @@ void EncryptedPreMasterSecret::read(SSL&
     }
 
     opaque preMasterSecret[SECRET_LEN];
+    memset(preMasterSecret, 0, sizeof(preMasterSecret));
     rsa.decrypt(preMasterSecret, secret_, length_, 
                 ssl.getCrypto().get_random());
 
@@ -300,6 +301,11 @@ void ClientDiffieHellmanPublic::read(SSL
     tmp[1] = input[AUTO];
     ato16(tmp, keyLength);
 
+    if (keyLength < dh.get_agreedKeyLength()/2) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     alloc(keyLength);
     input.read(Yc_, keyLength);
     if (input.get_error()) {
@@ -408,6 +414,10 @@ void DH_Server::read(SSL& ssl, input_buf
     tmp[1] = input[AUTO];
     ato16(tmp, length);
 
+    if (length == 0) {
+        ssl.SetError(bad_input);
+        return;
+    }
     signature_ = NEW_YS byte[length];
     input.read(signature_, length);
     if (input.get_error()) {
@@ -864,6 +874,12 @@ void ChangeCipherSpec::Process(input_buf
         return;
     }
 
+    // detect duplicate change_cipher
+    if (ssl.getSecurity().get_parms().pending_ == false) {
+        ssl.order_error();
+        return;
+    }
+
     ssl.useSecurity().use_parms().pending_ = false;
     if (ssl.getSecurity().get_resuming()) {
         if (ssl.getSecurity().get_parms().entity_ == client_end)
@@ -2047,12 +2063,8 @@ input_buffer& operator>>(input_buffer& i
         tmp[0] = input[AUTO];
         tmp[1] = input[AUTO];
         ato16(tmp, dnSz);
-        
-        DistinguishedName dn;
-        request.certificate_authorities_.push_back(dn = NEW_YS 
-                                                  byte[REQUEST_HEADER + dnSz]);
-        memcpy(dn, tmp, REQUEST_HEADER);
-        input.read(&dn[REQUEST_HEADER], dnSz);
+       
+        input.set_current(input.get_current() + dnSz);
 
         sz -= dnSz + REQUEST_HEADER;
 
@@ -2191,6 +2203,11 @@ input_buffer& operator>>(input_buffer& i
     ato16(tmp, sz);
     request.set_length(sz);
 
+    if (sz == 0) {
+        input.set_error();
+        return input;
+    }
+
     request.signature_ = NEW_YS byte[sz];
     input.read(request.signature_, sz);
 
diff -pruN 5.5.40-1/extra/yassl/src/yassl_int.cpp 5.5.42-1/extra/yassl/src/yassl_int.cpp
--- 5.5.40-1/extra/yassl/src/yassl_int.cpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/src/yassl_int.cpp	2015-01-06 20:39:40.000000000 +0000
@@ -255,6 +255,77 @@ void States::SetError(YasslError ye)
 }
 
 
+// mark message recvd, check for duplicates, return 0 on success
+int States::SetMessageRecvd(HandShakeType hst)
+{
+    switch (hst) {
+        case hello_request:
+            break;  // could send more than one
+
+        case client_hello:
+            if (recvdMessages_.gotClientHello_)
+                return -1;
+            recvdMessages_.gotClientHello_ = 1;
+            break;
+
+        case server_hello:
+            if (recvdMessages_.gotServerHello_)
+                return -1;
+            recvdMessages_.gotServerHello_ = 1;
+            break;
+
+        case certificate:
+            if (recvdMessages_.gotCert_)
+                return -1;
+            recvdMessages_.gotCert_ = 1;
+            break;
+
+        case server_key_exchange:
+            if (recvdMessages_.gotServerKeyExchange_)
+                return -1;
+            recvdMessages_.gotServerKeyExchange_ = 1;
+            break;
+
+        case certificate_request:
+            if (recvdMessages_.gotCertRequest_)
+                return -1;
+            recvdMessages_.gotCertRequest_ = 1;
+            break;
+
+        case server_hello_done:
+            if (recvdMessages_.gotServerHelloDone_)
+                return -1;
+            recvdMessages_.gotServerHelloDone_ = 1;
+            break;
+
+        case certificate_verify:
+            if (recvdMessages_.gotCertVerify_)
+                return -1;
+            recvdMessages_.gotCertVerify_ = 1;
+            break;
+
+        case client_key_exchange:
+            if (recvdMessages_.gotClientKeyExchange_)
+                return -1;
+            recvdMessages_.gotClientKeyExchange_ = 1;
+            break;
+
+        case finished:
+            if (recvdMessages_.gotFinished_)
+                return -1;
+            recvdMessages_.gotFinished_ = 1;
+            break;
+
+
+        default:
+            return -1;
+
+    }
+
+    return 0;
+}
+
+
 sslFactory::sslFactory() :           
         messageFactory_(InitMessageFactory),
         handShakeFactory_(InitHandShakeFactory),
@@ -1199,6 +1270,11 @@ void SSL::verifyState(const HandShakeHea
         return;
     }
 
+    if (states_.SetMessageRecvd(hsHeader.get_handshakeType()) != 0) {
+        order_error();
+        return;
+    }
+
     if (secure_.get_parms().entity_ == client_end)
         verifyClientState(hsHeader.get_handshakeType());
     else
diff -pruN 5.5.40-1/extra/yassl/taocrypt/src/asn.cpp 5.5.42-1/extra/yassl/taocrypt/src/asn.cpp
--- 5.5.40-1/extra/yassl/taocrypt/src/asn.cpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/taocrypt/src/asn.cpp	2015-01-06 20:39:40.000000000 +0000
@@ -672,7 +672,7 @@ word32 CertDecoder::GetSignature()
     }
 
     sigLength_ = GetLength(source_);
-    if (sigLength_ == 0 || source_.IsLeft(sigLength_) == false) {
+    if (sigLength_ <= 1 || source_.IsLeft(sigLength_) == false) {
         source_.SetError(CONTENT_E);
         return 0;
     }
@@ -1001,11 +1001,17 @@ bool CertDecoder::ConfirmSignature(Sourc
         RSA_PublicKey pubKey(pub);
         RSAES_Encryptor enc(pubKey);
 
+        if (pubKey.FixedCiphertextLength() != sigLength_) {
+            source_.SetError(SIG_LEN_E);
+            return false;
+        }
+
         return enc.SSL_Verify(build.get_buffer(), build.size(), signature_);
     }
     else  { // DSA
         // extract r and s from sequence
         byte seqDecoded[DSA_SIG_SZ];
+        memset(seqDecoded, 0, sizeof(seqDecoded));
         DecodeDSA_Signature(seqDecoded, signature_, sigLength_);
 
         DSA_PublicKey pubKey(pub);
diff -pruN 5.5.40-1/extra/yassl/taocrypt/src/integer.cpp 5.5.42-1/extra/yassl/taocrypt/src/integer.cpp
--- 5.5.40-1/extra/yassl/taocrypt/src/integer.cpp	2015-02-09 22:07:51.000000000 +0000
+++ 5.5.42-1/extra/yassl/taocrypt/src/integer.cpp	2015-02-09 22:07:53.000000000 +0000
@@ -2605,18 +2605,20 @@ void Integer::Decode(Source& source)
 void Integer::Decode(const byte* input, unsigned int inputLen, Signedness s)
 {
     unsigned int idx(0);
-    byte b = input[idx++];
+    byte b = 0; 
+    if (inputLen>0)
+        b = input[idx];   // peek
     sign_  = ((s==SIGNED) && (b & 0x80)) ? NEGATIVE : POSITIVE;
 
     while (inputLen>0 && (sign_==POSITIVE ? b==0 : b==0xff))
     {
-        inputLen--;
-        b = input[idx++];
+        idx++;   // skip
+        if (--inputLen>0)
+            b = input[idx];  // peek
     }
 
     reg_.CleanNew(RoundupSize(BytesToWords(inputLen)));
 
-    --idx;
     for (unsigned int i=inputLen; i > 0; i--)
     {
         b = input[idx++];
diff -pruN 5.5.40-1/extra/yassl/taocrypt/src/rsa.cpp 5.5.42-1/extra/yassl/taocrypt/src/rsa.cpp
--- 5.5.40-1/extra/yassl/taocrypt/src/rsa.cpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/taocrypt/src/rsa.cpp	2015-01-06 20:39:40.000000000 +0000
@@ -177,7 +177,7 @@ word32 RSA_BlockType1::UnPad(const byte*
 
     // skip past the padding until we find the separator
     unsigned i=1;
-    while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body
+    while (i<pkcsBlockLen && pkcsBlock[i++] == 0xFF) { // null body
         }
     if (!(i==pkcsBlockLen || pkcsBlock[i-1]==0))
         return 0;
diff -pruN 5.5.40-1/extra/yassl/testsuite/cipher-test.sh 5.5.42-1/extra/yassl/testsuite/cipher-test.sh
--- 5.5.40-1/extra/yassl/testsuite/cipher-test.sh	1970-01-01 00:00:00.000000000 +0000
+++ 5.5.42-1/extra/yassl/testsuite/cipher-test.sh	2015-01-06 20:39:40.000000000 +0000
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# test all yassl cipher suties 
+# 
+
+
+server_pid=$no_pid
+
+
+do_cleanup() {
+    echo "in cleanup"
+
+    if [[ $server_pid != $no_pid ]]
+    then
+        echo "killing server"
+        kill -9 $server_pid
+    fi
+}
+
+do_trap() {
+    echo "got trap"
+    do_cleanup
+    exit -1
+}
+
+trap do_trap INT TERM
+
+
+# make sure example server and client are built
+if test ! -s ../examples/server/server; then
+    echo "Please build yaSSL first, example server missing"
+    exit -1
+fi
+
+if test ! -s ../examples/client/client; then
+    echo "Please build yaSSL first, example client missing"
+    exit -1
+fi
+
+
+# non DSA suites
+for suite in {"DHE-RSA-AES256-SHA","AES256-SHA","DHE-RSA-AES128-SHA","AES128-SHA","AES256-RMD","AES128-RMD","DES-CBC3-RMD","DHE-RSA-AES256-RMD","DHE-RSA-AES128-RMD","DHE-RSA-DES-CBC3-RMD","RC4-SHA","RC4-MD5","DES-CBC3-SHA","DES-CBC-SHA","EDH-RSA-DES-CBC3-SHA","EDH-RSA-DES-CBC-SHA"}
+do
+  for client_auth in {y,n}
+  do
+    echo "Trying $suite client auth = $client_auth ..."
+
+    if test -e server_ready; then
+        echo -e "removing exisitng server_ready file"
+        rm server_ready
+    fi
+    ../examples/server/server $client_auth &
+    server_pid=$!
+
+    while [ ! -s server_ready ]; do
+        echo -e "waiting for server_ready file..."
+        sleep 0.1
+    done
+
+    ../examples/client/client $suite
+    client_result=$?
+
+    wait $server_pid
+    server_result=$?
+
+    server_pid=$no_pid
+
+    if [[ $client_result != 0 ]]
+    then
+        echo "Client Error"
+        exit $client_result
+    fi
+
+    if [[ $server_result != 0 ]]
+    then
+        echo "Server Error"
+        exit $server_result
+    fi
+
+  done   # end client auth loop
+done  # end non dsa suite list
+echo -e "Non DSA Loop SUCCESS"
+
+
+
+# DSA suites
+for suite in {"DHE-DSS-AES256-SHA","DHE-DSS-AES128-SHA","DHE-DSS-AES256-RMD","DHE-DSS-AES128-RMD","DHE-DSS-DES-CBC3-RMD","EDH-DSS-DES-CBC3-SHA","EDH-DSS-DES-CBC-SHA"}
+do
+  for client_auth in {y,n}
+  do
+    echo "Trying $suite client auth = $client_auth ..."
+
+    if test -e server_ready; then
+        echo -e "removing exisitng server_ready file"
+        rm server_ready
+    fi
+    # d signifies DSA
+    ../examples/server/server $client_auth d &
+    server_pid=$!
+
+    while [ ! -s server_ready ]; do
+        echo -e "waiting for server_ready file..."
+        sleep 0.1
+    done
+
+    ../examples/client/client $suite
+    client_result=$?
+
+    wait $server_pid
+    server_result=$?
+
+    server_pid=$no_pid
+
+    if [[ $client_result != 0 ]]
+    then
+        echo "Client Error"
+        exit $client_result
+    fi
+
+    if [[ $server_result != 0 ]]
+    then
+        echo "Server Error"
+        exit $server_result
+    fi
+
+  done   # end client auth loop
+done  # end dsa suite list
+echo -e "DSA Loop SUCCESS"
+
+exit 0
diff -pruN 5.5.40-1/extra/yassl/testsuite/test.hpp 5.5.42-1/extra/yassl/testsuite/test.hpp
--- 5.5.40-1/extra/yassl/testsuite/test.hpp	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/extra/yassl/testsuite/test.hpp	2015-01-06 20:39:40.000000000 +0000
@@ -131,9 +131,10 @@ struct func_args {
     int    argc;
     char** argv;
     int    return_code;
+    const char* file_ready;
     tcp_ready* signal_;
 
-    func_args(int c = 0, char** v = 0) : argc(c), argv(v) {}
+    func_args(int c = 0, char** v = 0) : argc(c), argv(v), file_ready(0) {}
 
     void SetSignal(tcp_ready* p) { signal_ = p; }
 };
@@ -146,6 +147,7 @@ void join_thread(THREAD_TYPE);
 // yaSSL
 const char* const    yasslIP      = "127.0.0.1";
 const unsigned short yasslPort    =  11111;
+const unsigned short proxyPort    =  12345;
 
 
 // client
@@ -172,13 +174,13 @@ const char* const svrKey3  = "../../../c
 
 // server dsa
 const char* const dsaCert = "../certs/dsa-cert.pem";
-const char* const dsaKey  = "../certs/dsa512.der";
+const char* const dsaKey  = "../certs/dsa1024.der";
 
 const char* const dsaCert2 = "../../certs/dsa-cert.pem";
-const char* const dsaKey2  = "../../certs/dsa512.der";
+const char* const dsaKey2  = "../../certs/dsa1024.der";
 
 const char* const dsaCert3 = "../../../certs/dsa-cert.pem";
-const char* const dsaKey3  = "../../../certs/dsa512.der";
+const char* const dsaKey3  = "../../../certs/dsa1024.der";
 
 
 // CA 
@@ -222,6 +224,13 @@ inline void store_ca(SSL_CTX* ctx)
         if (SSL_CTX_load_verify_locations(ctx, certSuite, 0) != SSL_SUCCESS)
             if (SSL_CTX_load_verify_locations(ctx, certDebug,0) != SSL_SUCCESS)
                 err_sys("failed to use certificate: certs/client-cert.pem");
+
+    // DSA cert 
+    if (SSL_CTX_load_verify_locations(ctx, dsaCert, 0) != SSL_SUCCESS)
+        if (SSL_CTX_load_verify_locations(ctx, dsaCert2, 0) != SSL_SUCCESS)
+            if (SSL_CTX_load_verify_locations(ctx, dsaCert3, 0) != SSL_SUCCESS)
+                err_sys("failed to use certificate: certs/dsa-cert.pem");
+
 }
 
 
@@ -298,7 +307,7 @@ inline void set_dsaServerCerts(SSL_CTX*
             != SSL_SUCCESS) 
                 if (SSL_CTX_use_PrivateKey_file(ctx, dsaKey3,SSL_FILETYPE_ASN1)
                     != SSL_SUCCESS) 
-                    err_sys("failed to use key file: certs/dsa512.der");
+                    err_sys("failed to use key file: certs/dsa1024.der");
 }
 
 
@@ -310,6 +319,12 @@ inline void set_args(int& argc, char**&
 }
 
 
+inline void set_file_ready(const char* name, func_args& args)
+{
+    args.file_ready = name;
+}
+
+
 inline void tcp_set_nonblocking(SOCKET_T& sockfd)
 {
 #ifdef NON_BLOCKING
@@ -349,7 +364,11 @@ inline void tcp_socket(SOCKET_T& sockfd,
         */   // end external testing later
 #else
     addr.sin_family = AF_INET_V;
+#ifdef YASSL_PROXY_PORT
+    addr.sin_port = htons(proxyPort);
+#else
     addr.sin_port = htons(yasslPort);
+#endif
     addr.sin_addr.s_addr = inet_addr(yasslIP);
 #endif
 
@@ -401,6 +420,16 @@ inline void tcp_listen(SOCKET_T& sockfd)
 }
 
 
+inline void create_ready_file(func_args& args)
+{
+    FILE* f = fopen(args.file_ready, "w+");
+
+    if (f) {
+        fputs("ready", f);
+        fclose(f);
+    }
+}
+
 
 inline void tcp_accept(SOCKET_T& sockfd, SOCKET_T& clientfd, func_args& args)
 {
@@ -418,6 +447,9 @@ inline void tcp_accept(SOCKET_T& sockfd,
     pthread_mutex_unlock(&ready.mutex_);
 #endif
 
+    if (args.file_ready)
+        create_ready_file(args);
+
     clientfd = accept(sockfd, (sockaddr*)&client, (ACCEPT_THIRD_T)&client_len);
 
     if (clientfd == (SOCKET_T) -1) {
diff -pruN 5.5.40-1/.gitignore 5.5.42-1/.gitignore
--- 5.5.40-1/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ 5.5.42-1/.gitignore	2015-01-06 20:39:40.000000000 +0000
@@ -0,0 +1,3071 @@
+*-t
+*.Plo
+*.Po
+*.a
+*.bb
+*.bbg
+*.bin
+*.cdf
+*.core
+*.d
+*.da
+*.dir
+*.dll
+*.dylib
+*.exe
+*.exp
+*.gcda
+*.gcno
+*.gcov
+*.idb
+*.ilk
+*.la
+*.lai
+*.lib
+*.lo
+*.manifest
+*.map
+*.o
+*.obj
+*.old
+*.pch
+*.pdb
+*.reject
+*.res
+*.rule
+*.sbr
+*.so
+*.so.*
+*.spec
+*.user
+*.vcproj
+*.vcproj.cmake
+*.vcxproj
+*.vcxproj.filters
+*/*.dir/*
+Debug
+MySql.sdf
+Win32
+*/*_pure_*warnings
+*/.deps
+*/.libs/*
+*/.pure
+*/debug/*
+*/minsizerel/*
+*/release/*
+RelWithDebInfo
+*~
+.*.swp
+./CMakeCache.txt
+./MySql.ncb
+./MySql.sln
+./MySql.suo
+./README.build-files
+./cmakecache.txt
+./config.h
+./copy_mysql_files.bat
+./fix-project-files
+./mysql*.ds?
+./mysql.ncb
+./mysql.sln
+./mysql.suo
+./prepare
+.DS_Store
+.defs.mk
+.depend
+.depend.mk
+.deps
+.gdb_history
+.gdbinit
+.libs
+.o
+.out
+.snprj/*
+.vimrc
+50
+=6
+BUILD/compile-pentium-maintainer
+BitKeeper/etc/RESYNC_TREE
+BitKeeper/etc/config
+BitKeeper/etc/csets
+BitKeeper/etc/csets-in
+BitKeeper/etc/csets-out
+BitKeeper/etc/gone
+BitKeeper/etc/level
+BitKeeper/etc/pushed
+BitKeeper/post-commit
+BitKeeper/post-commit-manual
+BitKeeper/tmp/*
+BitKeeper/tmp/bkr3sAHD
+BitKeeper/tmp/gone
+CMakeFiles
+CMakeFiles/*
+CTestTestfile.cmake
+COPYING
+COPYING.LIB
+Docs/#manual.texi#
+Docs/INSTALL-BINARY
+Docs/Images/myaccess-odbc.txt
+Docs/Images/myaccess.txt
+Docs/Images/myarchitecture.txt
+Docs/Images/mydll-properties.txt
+Docs/Images/mydsn-example.txt
+Docs/Images/mydsn-icon.txt
+Docs/Images/mydsn-options.txt
+Docs/Images/mydsn-setup.txt
+Docs/Images/mydsn-test-fail.txt
+Docs/Images/mydsn-test-success.txt
+Docs/Images/mydsn-trace.txt
+Docs/Images/mydsn.txt
+Docs/Images/myflowchart.txt
+Docs/include.texi
+Docs/internals.html
+Docs/internals.info
+Docs/internals.pdf
+Docs/internals.txt
+Docs/internals_toc.html
+Docs/manual.aux
+Docs/manual.cp
+Docs/manual.cps
+Docs/manual.de.log
+Docs/manual.dvi
+Docs/manual.fn
+Docs/manual.fns
+Docs/manual.html
+Docs/manual.ky
+Docs/manual.log
+Docs/manual.pdf
+Docs/manual.pg
+Docs/manual.texi.orig
+Docs/manual.texi.rej
+Docs/manual.toc
+Docs/manual.tp
+Docs/manual.txt
+Docs/manual.vr
+Docs/manual_a4.ps
+Docs/manual_letter.ps
+Docs/manual_toc.html
+Docs/my_sys.doc
+Docs/mysql.info
+Docs/mysql.xml
+Docs/safe-mysql.xml
+Docs/tex.fmt
+Docs/texi2dvi.out
+EXCEPTIONS-CLIENT
+INSTALL-SOURCE
+INSTALL-WIN-SOURCE
+Logs/*
+MIRRORS
+Makefile
+Makefile.in
+Makefile.in'
+PENDING/*
+scripts/scripts
+TAGS
+VC++Files/client/mysql_amd64.dsp
+ac_available_languages_fragment
+acinclude.m4
+aclocal.m4
+analyse.test
+autom4te-2.53.cache/*
+autom4te-2.53.cache/output.0
+autom4te-2.53.cache/requests
+autom4te-2.53.cache/traces.0
+autom4te.cache/*
+autom4te.cache/output.0
+autom4te.cache/requests
+autom4te.cache/traces.0
+bdb/*.ds?
+bdb/*.vcproj
+bdb/README
+bdb/btree/btree_auto.c
+bdb/build_unix/*
+bdb/build_vxworks/db.h
+bdb/build_vxworks/db_int.h
+bdb/build_win32/db.h
+bdb/build_win32/db_archive.dsp
+bdb/build_win32/db_checkpoint.dsp
+bdb/build_win32/db_config.h
+bdb/build_win32/db_cxx.h
+bdb/build_win32/db_deadlock.dsp
+bdb/build_win32/db_dll.dsp
+bdb/build_win32/db_dump.dsp
+bdb/build_win32/db_int.h
+bdb/build_win32/db_java.dsp
+bdb/build_win32/db_load.dsp
+bdb/build_win32/db_perf.dsp
+bdb/build_win32/db_printlog.dsp
+bdb/build_win32/db_recover.dsp
+bdb/build_win32/db_stat.dsp
+bdb/build_win32/db_static.dsp
+bdb/build_win32/db_tcl.dsp
+bdb/build_win32/db_test.dsp
+bdb/build_win32/db_upgrade.dsp
+bdb/build_win32/db_verify.dsp
+bdb/build_win32/ex_access.dsp
+bdb/build_win32/ex_btrec.dsp
+bdb/build_win32/ex_env.dsp
+bdb/build_win32/ex_lock.dsp
+bdb/build_win32/ex_mpool.dsp
+bdb/build_win32/ex_tpcb.dsp
+bdb/build_win32/excxx_access.dsp
+bdb/build_win32/excxx_btrec.dsp
+bdb/build_win32/excxx_env.dsp
+bdb/build_win32/excxx_lock.dsp
+bdb/build_win32/excxx_mpool.dsp
+bdb/build_win32/excxx_tpcb.dsp
+bdb/build_win32/include.tcl
+bdb/build_win32/libdb.def
+bdb/build_win32/libdb.rc
+bdb/db/crdel_auto.c
+bdb/db/db_auto.c
+bdb/dbinc_auto/*.*
+bdb/dbreg/dbreg_auto.c
+bdb/dist/autom4te-2.53.cache/*
+bdb/dist/autom4te-2.53.cache/output.0
+bdb/dist/autom4te-2.53.cache/requests
+bdb/dist/autom4te-2.53.cache/traces.0
+bdb/dist/autom4te.cache/*
+bdb/dist/autom4te.cache/output.0
+bdb/dist/autom4te.cache/requests
+bdb/dist/autom4te.cache/traces.0
+bdb/dist/config.hin
+bdb/dist/configure
+bdb/dist/db.h
+bdb/dist/db_config.h
+bdb/dist/db_cxx.h
+bdb/dist/db_int.h
+bdb/dist/include.tcl
+bdb/dist/tags
+bdb/dist/template/db_server_proc
+bdb/dist/template/gen_client_ret
+bdb/dist/template/rec_btree
+bdb/dist/template/rec_crdel
+bdb/dist/template/rec_db
+bdb/dist/template/rec_dbreg
+bdb/dist/template/rec_fileops
+bdb/dist/template/rec_hash
+bdb/dist/template/rec_log
+bdb/dist/template/rec_qam
+bdb/dist/template/rec_txn
+bdb/examples_c/ex_apprec/ex_apprec_auto.c
+bdb/examples_c/ex_apprec/ex_apprec_auto.h
+bdb/examples_c/ex_apprec/ex_apprec_template
+bdb/examples_java
+bdb/fileops/fileops_auto.c
+bdb/hash/hash_auto.c
+bdb/include/btree_auto.h
+bdb/include/btree_ext.h
+bdb/include/clib_ext.h
+bdb/include/common_ext.h
+bdb/include/crdel_auto.h
+bdb/include/db_auto.h
+bdb/include/db_ext.h
+bdb/include/db_server.h
+bdb/include/env_ext.h
+bdb/include/gen_client_ext.h
+bdb/include/gen_server_ext.h
+bdb/include/hash_auto.h
+bdb/include/hash_ext.h
+bdb/include/lock_ext.h
+bdb/include/log_auto.h
+bdb/include/log_ext.h
+bdb/include/mp_ext.h
+bdb/include/mutex_ext.h
+bdb/include/os_ext.h
+bdb/include/qam_auto.h
+bdb/include/qam_ext.h
+bdb/include/rpc_client_ext.h
+bdb/include/rpc_server_ext.h
+bdb/include/tcl_ext.h
+bdb/include/txn_auto.h
+bdb/include/txn_ext.h
+bdb/include/xa_ext.h
+bdb/java/src/com/sleepycat/db/Db.java
+bdb/java/src/com/sleepycat/db/DbBtreeStat.java
+bdb/java/src/com/sleepycat/db/DbConstants.java
+bdb/java/src/com/sleepycat/db/DbHashStat.java
+bdb/java/src/com/sleepycat/db/DbLockStat.java
+bdb/java/src/com/sleepycat/db/DbLogStat.java
+bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+bdb/java/src/com/sleepycat/db/DbQueueStat.java
+bdb/java/src/com/sleepycat/db/DbRepStat.java
+bdb/java/src/com/sleepycat/db/DbTxnStat.java
+bdb/libdb_java/java_stat_auto.c
+bdb/libdb_java/java_stat_auto.h
+bdb/log/log_auto.c
+bdb/qam/qam_auto.c
+bdb/rpc_client/db_server_clnt.c
+bdb/rpc_client/gen_client.c
+bdb/rpc_server/c/db_server_proc.c
+bdb/rpc_server/c/db_server_proc.sed
+bdb/rpc_server/c/db_server_svc.c
+bdb/rpc_server/c/db_server_xdr.c
+bdb/rpc_server/c/gen_db_server.c
+bdb/rpc_server/db_server.x
+bdb/rpc_server/db_server_proc.sed
+bdb/rpc_server/db_server_svc.c
+bdb/rpc_server/db_server_xdr.c
+bdb/rpc_server/gen_db_server.c
+bdb/test/TESTS
+bdb/test/include.tcl
+bdb/test/logtrack.list
+bdb/txn/txn_auto.c
+binary/*
+bkpull.log
+bkpull.log*
+bkpull.log.2
+bkpull.log.3
+bkpull.log.4
+bkpull.log.5
+bkpull.log.6
+bkpush.log
+bkpush.log*
+build.log
+build_tags.sh
+client/#mysql.cc#
+client/*.ds?
+client/*.vcproj
+client/.deps/base64.Po
+client/.deps/completion_hash.Po
+client/.deps/dummy.Po
+client/.deps/mf_tempdir.Po
+client/.deps/my_bit.Po
+client/.deps/my_bitmap.Po
+client/.deps/my_getsystime.Po
+client/.deps/my_new.Po
+client/.deps/my_user.Po
+client/.deps/my_vle.Po
+client/.deps/mysql.Po
+client/.deps/mysql_upgrade.Po
+client/.deps/mysqladmin.Po
+client/.deps/mysqlbinlog.Po
+client/.deps/mysqlcheck.Po
+client/.deps/mysqldump.Po
+client/.deps/mysqlimport.Po
+client/.deps/mysqlshow.Po
+client/.deps/mysqlslap.Po
+client/.deps/mysqltest.Po
+client/.deps/readline.Po
+client/.deps/sql_string.Po
+client/.libs -prune
+client/.libs/lt-mysql
+client/.libs/lt-mysqladmin
+client/.libs/lt-mysqlbinlog
+client/.libs/lt-mysqlcheck
+client/.libs/lt-mysqldump
+client/.libs/lt-mysqlimport
+client/.libs/lt-mysqlshow
+client/.libs/lt-mysqlslap
+client/.libs/lt-mysqltest
+client/.libs/mysql
+client/.libs/mysql_upgrade
+client/.libs/mysqladmin
+client/.libs/mysqlbinlog
+client/.libs/mysqlcheck
+client/.libs/mysqldump
+client/.libs/mysqlimport
+client/.libs/mysqlshow
+client/.libs/mysqlslap
+client/.libs/mysqltest
+client/completion_hash.cpp
+client/decimal.c
+client/insert_test
+client/link_sources
+client/log_event.cc
+client/log_event.h
+client/log_event_old.cc
+client/log_event_old.h
+client/mf_iocache.c
+client/mf_iocache.cc
+client/my_decimal.cc
+client/my_decimal.h
+client/my_user.c
+client/mysql
+client/mysql.cpp
+client/mysql_upgrade
+client/mysqladmin
+client/mysqladmin.c
+client/mysqladmin.cpp
+client/mysqlbinlog
+client/mysqlbinlog.cpp
+client/mysqlcheck
+client/mysqldump
+client/mysqlimport
+client/mysqlmanager-pwgen
+client/mysqlmanagerc
+client/mysqlshow
+client/mysqlslap
+client/mysqltest
+client/mysqltestmanager-pwgen
+client/mysqltestmanagerc
+client/mysys_priv.h
+client/readline.cpp
+client/rpl_constants.h
+client/rpl_record_old.cc
+client/rpl_record_old.h
+client/rpl_tblmap.h
+client/rpl_tblmap.cc
+client/rpl_utility.h
+client/rpl_utility.cc
+client/select_test
+client/sql_const.h
+client/sql_string.cpp
+client/ssl_test
+client/thimble
+client/thread_test
+client/tmp.diff
+client_debug/*
+client_release/*
+client_test
+cmake_install.cmake
+cmd-line-utils/libedit/.deps/chared.Po
+cmd-line-utils/libedit/.deps/common.Po
+cmd-line-utils/libedit/.deps/el.Po
+cmd-line-utils/libedit/.deps/emacs.Po
+cmd-line-utils/libedit/.deps/fcns.Po
+cmd-line-utils/libedit/.deps/fgetln.Po
+cmd-line-utils/libedit/.deps/help.Po
+cmd-line-utils/libedit/.deps/hist.Po
+cmd-line-utils/libedit/.deps/history.Po
+cmd-line-utils/libedit/.deps/key.Po
+cmd-line-utils/libedit/.deps/map.Po
+cmd-line-utils/libedit/.deps/parse.Po
+cmd-line-utils/libedit/.deps/prompt.Po
+cmd-line-utils/libedit/.deps/read.Po
+cmd-line-utils/libedit/.deps/readline.Po
+cmd-line-utils/libedit/.deps/refresh.Po
+cmd-line-utils/libedit/.deps/search.Po
+cmd-line-utils/libedit/.deps/sig.Po
+cmd-line-utils/libedit/.deps/strlcat.Po
+cmd-line-utils/libedit/.deps/strlcpy.Po
+cmd-line-utils/libedit/.deps/term.Po
+cmd-line-utils/libedit/.deps/tokenizer.Po
+cmd-line-utils/libedit/.deps/tty.Po
+cmd-line-utils/libedit/.deps/unvis.Po
+cmd-line-utils/libedit/.deps/vi.Po
+cmd-line-utils/libedit/.deps/vis.Po
+cmd-line-utils/libedit/common.h
+cmd-line-utils/libedit/makelist
+cmd-line-utils/readline/.deps/bind.Po
+cmd-line-utils/readline/.deps/callback.Po
+cmd-line-utils/readline/.deps/compat.Po
+cmd-line-utils/readline/.deps/complete.Po
+cmd-line-utils/readline/.deps/display.Po
+cmd-line-utils/readline/.deps/funmap.Po
+cmd-line-utils/readline/.deps/histexpand.Po
+cmd-line-utils/readline/.deps/histfile.Po
+cmd-line-utils/readline/.deps/history.Po
+cmd-line-utils/readline/.deps/histsearch.Po
+cmd-line-utils/readline/.deps/input.Po
+cmd-line-utils/readline/.deps/isearch.Po
+cmd-line-utils/readline/.deps/keymaps.Po
+cmd-line-utils/readline/.deps/kill.Po
+cmd-line-utils/readline/.deps/macro.Po
+cmd-line-utils/readline/.deps/mbutil.Po
+cmd-line-utils/readline/.deps/misc.Po
+cmd-line-utils/readline/.deps/nls.Po
+cmd-line-utils/readline/.deps/parens.Po
+cmd-line-utils/readline/.deps/readline.Po
+cmd-line-utils/readline/.deps/rltty.Po
+cmd-line-utils/readline/.deps/savestring.Po
+cmd-line-utils/readline/.deps/search.Po
+cmd-line-utils/readline/.deps/shell.Po
+cmd-line-utils/readline/.deps/signals.Po
+cmd-line-utils/readline/.deps/terminal.Po
+cmd-line-utils/readline/.deps/text.Po
+cmd-line-utils/readline/.deps/tilde.Po
+cmd-line-utils/readline/.deps/undo.Po
+cmd-line-utils/readline/.deps/util.Po
+cmd-line-utils/readline/.deps/vi_mode.Po
+cmd-line-utils/readline/.deps/xmalloc.Po
+comon.h
+comp_err/*.ds?
+comp_err/*.vcproj
+compile
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.lineno
+contrib/*.ds?
+contrib/*.vcproj
+core
+core.*
+cscope.in.out
+cscope.out
+cscope.po.out
+db-*.*.*
+dbug/*.ds?
+dbug/*.vcproj
+dbug/.deps/dbug.Po
+dbug/.deps/dbug_analyze.Po
+dbug/.deps/factorial.Po
+dbug/.deps/my_main.Po
+dbug/.deps/sanity.Po
+dbug/dbug_analyze
+dbug/example*.r
+dbug/factorial
+dbug/factorial.r
+dbug/main.r
+dbug/output*.r
+dbug/user.ps
+dbug/user.t
+debian/control
+debian/defs.mk
+depcomp
+emacs.h
+examples/*.ds?
+examples/*.vcproj
+examples/udf_example/udf_example.def
+extra/.deps/charset2html.Po
+extra/.deps/comp_err.Po
+extra/.deps/innochecksum.Po
+extra/.deps/my_print_defaults.Po
+extra/.deps/mysql_waitpid.Po
+extra/.deps/perror.Po
+extra/.deps/replace.Po
+extra/.deps/resolve_stack_dump.Po
+extra/.deps/resolveip.Po
+extra/charset2html
+extra/comp_err
+extra/created_include_files
+extra/innochecksum
+extra/my_print_defaults
+extra/mysql_install
+extra/mysql_tzinfo_to_sql
+extra/mysql_waitpid
+extra/mysqld_ername.h
+extra/mysqld_error.h
+extra/perror
+extra/replace
+extra/resolve_stack_dump
+extra/resolveip
+extra/sql_state.h
+extra/tztime.cc
+extra/yassl/src/.deps/buffer.Plo
+extra/yassl/src/.deps/cert_wrapper.Plo
+extra/yassl/src/.deps/crypto_wrapper.Plo
+extra/yassl/src/.deps/handshake.Plo
+extra/yassl/src/.deps/lock.Plo
+extra/yassl/src/.deps/log.Plo
+extra/yassl/src/.deps/socket_wrapper.Plo
+extra/yassl/src/.deps/ssl.Plo
+extra/yassl/src/.deps/template_instnt.Plo
+extra/yassl/src/.deps/timer.Plo
+extra/yassl/src/.deps/yassl_error.Plo
+extra/yassl/src/.deps/yassl_imp.Plo
+extra/yassl/src/.deps/yassl_int.Plo
+extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
+extra/yassl/taocrypt/benchmark/benchmark
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
+extra/yassl/taocrypt/test/.deps/test-test.Po
+extra/yassl/taocrypt/test/test
+extra/yassl/testsuite/.deps/testsuite-client.Po
+extra/yassl/testsuite/.deps/testsuite-echoclient.Po
+extra/yassl/testsuite/.deps/testsuite-echoserver.Po
+extra/yassl/testsuite/.deps/testsuite-server.Po
+extra/yassl/testsuite/.deps/testsuite-test.Po
+extra/yassl/testsuite/.deps/testsuite-testsuite.Po
+extra/yassl/testsuite/testsuite
+fcns.c
+fcns.h
+gdbinit
+gmon.out
+hardcopy.0
+heap/*.ds?
+heap/*.vcproj
+heap/hp_test1
+heap/hp_test2
+help
+help.c
+help.h
+include/abi_check
+include/check_abi
+include/link_sources
+include/my_config.h
+include/my_global.h
+include/mysql_h.ic
+include/mysql_version.h
+include/mysqld_ername.h
+include/mysqld_error.h
+include/mysqld_error.h.rule
+include/openssl
+include/probes_mysql_dtrace.h
+include/readline
+include/readline/*.h
+include/readline/readline.h
+include/sql_state.h
+include/widec.h
+innobase/*.ds?
+innobase/*.vcproj
+innobase/autom4te-2.53.cache/*
+innobase/autom4te-2.53.cache/output.0
+innobase/autom4te-2.53.cache/requests
+innobase/autom4te-2.53.cache/traces.0
+innobase/autom4te.cache/*
+innobase/autom4te.cache/output.0
+innobase/autom4te.cache/requests
+innobase/autom4te.cache/traces.0
+innobase/configure.lineno
+innobase/conftest.s1
+innobase/conftest.subs
+innobase/ib_config.h
+innobase/ib_config.h.in
+innobase/mkinstalldirs
+innobase/stamp-h1
+insert_test
+install
+install-sh
+isam/*.ds?
+isam/*.vcproj
+isam/isamchk
+isam/isamlog
+isam/pack_isam
+isam/test1
+isam/test2
+isam/test3
+isamchk/*.ds?
+isamchk/*.vcproj
+item_xmlfunc.cc
+lib_debug/*
+lib_release/*
+libmysql/*.c
+libmysql/*.ds?
+libmysql/*.vcproj
+libmysql/.deps/array.Plo
+libmysql/.deps/bchange.Plo
+libmysql/.deps/bcmp.Plo
+libmysql/.deps/bmove.Plo
+libmysql/.deps/bmove_upp.Plo
+libmysql/.deps/charset-def.Plo
+libmysql/.deps/charset.Plo
+libmysql/.deps/client.Plo
+libmysql/.deps/conf_to_src.Po
+libmysql/.deps/ctype-big5.Plo
+libmysql/.deps/ctype-bin.Plo
+libmysql/.deps/ctype-cp932.Plo
+libmysql/.deps/ctype-czech.Plo
+libmysql/.deps/ctype-euc_kr.Plo
+libmysql/.deps/ctype-eucjpms.Plo
+libmysql/.deps/ctype-extra.Plo
+libmysql/.deps/ctype-gb2312.Plo
+libmysql/.deps/ctype-gbk.Plo
+libmysql/.deps/ctype-latin1.Plo
+libmysql/.deps/ctype-mb.Plo
+libmysql/.deps/ctype-simple.Plo
+libmysql/.deps/ctype-sjis.Plo
+libmysql/.deps/ctype-tis620.Plo
+libmysql/.deps/ctype-uca.Plo
+libmysql/.deps/ctype-ucs2.Plo
+libmysql/.deps/ctype-ujis.Plo
+libmysql/.deps/ctype-utf8.Plo
+libmysql/.deps/ctype-win1250ch.Plo
+libmysql/.deps/ctype.Plo
+libmysql/.deps/dbug.Plo
+libmysql/.deps/default.Plo
+libmysql/.deps/default_modify.Plo
+libmysql/.deps/errmsg.Plo
+libmysql/.deps/errors.Plo
+libmysql/.deps/get_password.Plo
+libmysql/.deps/hash.Plo
+libmysql/.deps/int2str.Plo
+libmysql/.deps/is_prefix.Plo
+libmysql/.deps/libmysql.Plo
+libmysql/.deps/list.Plo
+libmysql/.deps/llstr.Plo
+libmysql/.deps/longlong2str.Plo
+libmysql/.deps/manager.Plo
+libmysql/.deps/md5.Plo
+libmysql/.deps/mf_cache.Plo
+libmysql/.deps/mf_dirname.Plo
+libmysql/.deps/mf_fn_ext.Plo
+libmysql/.deps/mf_format.Plo
+libmysql/.deps/mf_iocache.Plo
+libmysql/.deps/mf_iocache2.Plo
+libmysql/.deps/mf_loadpath.Plo
+libmysql/.deps/mf_pack.Plo
+libmysql/.deps/mf_path.Plo
+libmysql/.deps/mf_tempfile.Plo
+libmysql/.deps/mf_unixpath.Plo
+libmysql/.deps/mf_wcomp.Plo
+libmysql/.deps/mulalloc.Plo
+libmysql/.deps/my_alloc.Plo
+libmysql/.deps/my_chsize.Plo
+libmysql/.deps/my_compress.Plo
+libmysql/.deps/my_create.Plo
+libmysql/.deps/my_delete.Plo
+libmysql/.deps/my_div.Plo
+libmysql/.deps/my_error.Plo
+libmysql/.deps/my_file.Plo
+libmysql/.deps/my_fopen.Plo
+libmysql/.deps/my_fstream.Plo
+libmysql/.deps/my_gethostbyname.Plo
+libmysql/.deps/my_getopt.Plo
+libmysql/.deps/my_getwd.Plo
+libmysql/.deps/my_init.Plo
+libmysql/.deps/my_lib.Plo
+libmysql/.deps/my_malloc.Plo
+libmysql/.deps/my_messnc.Plo
+libmysql/.deps/my_net.Plo
+libmysql/.deps/my_once.Plo
+libmysql/.deps/my_open.Plo
+libmysql/.deps/my_port.Plo
+libmysql/.deps/my_pread.Plo
+libmysql/.deps/my_pthread.Plo
+libmysql/.deps/my_read.Plo
+libmysql/.deps/my_realloc.Plo
+libmysql/.deps/my_rename.Plo
+libmysql/.deps/my_seek.Plo
+libmysql/.deps/my_sleep.Plo
+libmysql/.deps/my_static.Plo
+libmysql/.deps/my_strtoll10.Plo
+libmysql/.deps/my_symlink.Plo
+libmysql/.deps/my_thr_init.Plo
+libmysql/.deps/my_time.Plo
+libmysql/.deps/my_vsnprintf.Plo
+libmysql/.deps/my_write.Plo
+libmysql/.deps/net.Plo
+libmysql/.deps/pack.Plo
+libmysql/.deps/password.Plo
+libmysql/.deps/safemalloc.Plo
+libmysql/.deps/sha1.Plo
+libmysql/.deps/str2int.Plo
+libmysql/.deps/str_alloc.Plo
+libmysql/.deps/strcend.Plo
+libmysql/.deps/strcont.Plo
+libmysql/.deps/strend.Plo
+libmysql/.deps/strfill.Plo
+libmysql/.deps/string.Plo
+libmysql/.deps/strinstr.Plo
+libmysql/.deps/strmake.Plo
+libmysql/.deps/strmov.Plo
+libmysql/.deps/strnlen.Plo
+libmysql/.deps/strnmov.Plo
+libmysql/.deps/strtod.Plo
+libmysql/.deps/strtoll.Plo
+libmysql/.deps/strtoull.Plo
+libmysql/.deps/strxmov.Plo
+libmysql/.deps/strxnmov.Plo
+libmysql/.deps/thr_mutex.Plo
+libmysql/.deps/typelib.Plo
+libmysql/.deps/vio.Plo
+libmysql/.deps/viosocket.Plo
+libmysql/.deps/viossl.Plo
+libmysql/.deps/viosslfactories.Plo
+libmysql/.deps/xml.Plo
+libmysql/.libs/libmysqlclient.lai
+libmysql/.libs/libmysqlclient.so.15
+libmysql/.libs/libmysqlclient.so.15.0.0
+libmysql/conf_to_src
+libmysql/debug/libmysql.exp
+libmysql/libmysql.ver
+libmysql/link_sources
+libmysql/my_static.h
+libmysql/my_time.c
+libmysql/mysys_priv.h
+libmysql/net.c
+libmysql/release/libmysql.exp
+libmysql/vio_priv.h
+libmysql/viosocket.o.6WmSJk
+libmysql_r/*.c
+libmysql_r/.deps/array.Plo
+libmysql_r/.deps/bchange.Plo
+libmysql_r/.deps/bcmp.Plo
+libmysql_r/.deps/bmove.Plo
+libmysql_r/.deps/bmove_upp.Plo
+libmysql_r/.deps/charset-def.Plo
+libmysql_r/.deps/charset.Plo
+libmysql_r/.deps/client.Plo
+libmysql_r/.deps/conf_to_src.Po
+libmysql_r/.deps/ctype-big5.Plo
+libmysql_r/.deps/ctype-bin.Plo
+libmysql_r/.deps/ctype-cp932.Plo
+libmysql_r/.deps/ctype-czech.Plo
+libmysql_r/.deps/ctype-euc_kr.Plo
+libmysql_r/.deps/ctype-eucjpms.Plo
+libmysql_r/.deps/ctype-extra.Plo
+libmysql_r/.deps/ctype-gb2312.Plo
+libmysql_r/.deps/ctype-gbk.Plo
+libmysql_r/.deps/ctype-latin1.Plo
+libmysql_r/.deps/ctype-mb.Plo
+libmysql_r/.deps/ctype-simple.Plo
+libmysql_r/.deps/ctype-sjis.Plo
+libmysql_r/.deps/ctype-tis620.Plo
+libmysql_r/.deps/ctype-uca.Plo
+libmysql_r/.deps/ctype-ucs2.Plo
+libmysql_r/.deps/ctype-ujis.Plo
+libmysql_r/.deps/ctype-utf8.Plo
+libmysql_r/.deps/ctype-win1250ch.Plo
+libmysql_r/.deps/ctype.Plo
+libmysql_r/.deps/dbug.Plo
+libmysql_r/.deps/default.Plo
+libmysql_r/.deps/default_modify.Plo
+libmysql_r/.deps/errmsg.Plo
+libmysql_r/.deps/errors.Plo
+libmysql_r/.deps/get_password.Plo
+libmysql_r/.deps/hash.Plo
+libmysql_r/.deps/int2str.Plo
+libmysql_r/.deps/is_prefix.Plo
+libmysql_r/.deps/libmysql.Plo
+libmysql_r/.deps/list.Plo
+libmysql_r/.deps/llstr.Plo
+libmysql_r/.deps/longlong2str.Plo
+libmysql_r/.deps/manager.Plo
+libmysql_r/.deps/md5.Plo
+libmysql_r/.deps/mf_cache.Plo
+libmysql_r/.deps/mf_dirname.Plo
+libmysql_r/.deps/mf_fn_ext.Plo
+libmysql_r/.deps/mf_format.Plo
+libmysql_r/.deps/mf_iocache.Plo
+libmysql_r/.deps/mf_iocache2.Plo
+libmysql_r/.deps/mf_loadpath.Plo
+libmysql_r/.deps/mf_pack.Plo
+libmysql_r/.deps/mf_path.Plo
+libmysql_r/.deps/mf_tempfile.Plo
+libmysql_r/.deps/mf_unixpath.Plo
+libmysql_r/.deps/mf_wcomp.Plo
+libmysql_r/.deps/mulalloc.Plo
+libmysql_r/.deps/my_alloc.Plo
+libmysql_r/.deps/my_chsize.Plo
+libmysql_r/.deps/my_compress.Plo
+libmysql_r/.deps/my_create.Plo
+libmysql_r/.deps/my_delete.Plo
+libmysql_r/.deps/my_div.Plo
+libmysql_r/.deps/my_error.Plo
+libmysql_r/.deps/my_file.Plo
+libmysql_r/.deps/my_fopen.Plo
+libmysql_r/.deps/my_fstream.Plo
+libmysql_r/.deps/my_gethostbyname.Plo
+libmysql_r/.deps/my_getopt.Plo
+libmysql_r/.deps/my_getwd.Plo
+libmysql_r/.deps/my_init.Plo
+libmysql_r/.deps/my_lib.Plo
+libmysql_r/.deps/my_malloc.Plo
+libmysql_r/.deps/my_messnc.Plo
+libmysql_r/.deps/my_net.Plo
+libmysql_r/.deps/my_once.Plo
+libmysql_r/.deps/my_open.Plo
+libmysql_r/.deps/my_port.Plo
+libmysql_r/.deps/my_pread.Plo
+libmysql_r/.deps/my_pthread.Plo
+libmysql_r/.deps/my_read.Plo
+libmysql_r/.deps/my_realloc.Plo
+libmysql_r/.deps/my_rename.Plo
+libmysql_r/.deps/my_seek.Plo
+libmysql_r/.deps/my_sleep.Plo
+libmysql_r/.deps/my_static.Plo
+libmysql_r/.deps/my_strtoll10.Plo
+libmysql_r/.deps/my_symlink.Plo
+libmysql_r/.deps/my_thr_init.Plo
+libmysql_r/.deps/my_time.Plo
+libmysql_r/.deps/my_vsnprintf.Plo
+libmysql_r/.deps/my_write.Plo
+libmysql_r/.deps/net.Plo
+libmysql_r/.deps/pack.Plo
+libmysql_r/.deps/password.Plo
+libmysql_r/.deps/safemalloc.Plo
+libmysql_r/.deps/sha1.Plo
+libmysql_r/.deps/str2int.Plo
+libmysql_r/.deps/str_alloc.Plo
+libmysql_r/.deps/strcend.Plo
+libmysql_r/.deps/strcont.Plo
+libmysql_r/.deps/strend.Plo
+libmysql_r/.deps/strfill.Plo
+libmysql_r/.deps/string.Plo
+libmysql_r/.deps/strinstr.Plo
+libmysql_r/.deps/strmake.Plo
+libmysql_r/.deps/strmov.Plo
+libmysql_r/.deps/strnlen.Plo
+libmysql_r/.deps/strnmov.Plo
+libmysql_r/.deps/strtod.Plo
+libmysql_r/.deps/strtoll.Plo
+libmysql_r/.deps/strtoull.Plo
+libmysql_r/.deps/strxmov.Plo
+libmysql_r/.deps/strxnmov.Plo
+libmysql_r/.deps/thr_mutex.Plo
+libmysql_r/.deps/typelib.Plo
+libmysql_r/.deps/vio.Plo
+libmysql_r/.deps/viosocket.Plo
+libmysql_r/.deps/viossl.Plo
+libmysql_r/.deps/viosslfactories.Plo
+libmysql_r/.deps/xml.Plo
+libmysql_r/.libs/libmysqlclient_r.lai
+libmysql_r/.libs/libmysqlclient_r.so.15
+libmysql_r/.libs/libmysqlclient_r.so.15.0.0
+libmysql_r/acconfig.h
+libmysql_r/client_settings.h
+libmysql_r/conf_to_src
+libmysql_r/link_sources
+libmysql_r/my_static.h
+libmysql_r/mysys_priv.h
+libmysql_r/vio_priv.h
+libmysqld/*.ds?
+libmysqld/*.vcproj
+libmysqld/.deps/client.Po
+libmysqld/.deps/derror.Po
+libmysqld/.deps/discover.Po
+libmysqld/.deps/emb_qcache.Po
+libmysqld/.deps/errmsg.Po
+libmysqld/.deps/event_data_objects.Po
+libmysqld/.deps/event_db_repository.Po
+libmysqld/.deps/event_queue.Po
+libmysqld/.deps/event_scheduler.Po
+libmysqld/.deps/events.Po
+libmysqld/.deps/field.Po
+libmysqld/.deps/field_conv.Po
+libmysqld/.deps/filesort.Po
+libmysqld/.deps/get_password.Po
+libmysqld/.deps/gstream.Po
+libmysqld/.deps/ha_berkeley.Po
+libmysqld/.deps/ha_federated.Po
+libmysqld/.deps/ha_heap.Po
+libmysqld/.deps/ha_innodb.Po
+libmysqld/.deps/ha_myisam.Po
+libmysqld/.deps/ha_myisammrg.Po
+libmysqld/.deps/ha_ndbcluster.Po
+libmysqld/.deps/ha_ndbcluster_binlog.Po
+libmysqld/.deps/ha_partition.Po
+libmysqld/.deps/handler.Po
+libmysqld/.deps/hash_filo.Po
+libmysqld/.deps/hostname.Po
+libmysqld/.deps/init.Po
+libmysqld/.deps/item.Po
+libmysqld/.deps/item_buff.Po
+libmysqld/.deps/item_cmpfunc.Po
+libmysqld/.deps/item_create.Po
+libmysqld/.deps/item_func.Po
+libmysqld/.deps/item_geofunc.Po
+libmysqld/.deps/item_row.Po
+libmysqld/.deps/item_strfunc.Po
+libmysqld/.deps/item_subselect.Po
+libmysqld/.deps/item_sum.Po
+libmysqld/.deps/item_timefunc.Po
+libmysqld/.deps/item_uniq.Po
+libmysqld/.deps/item_xmlfunc.Po
+libmysqld/.deps/key.Po
+libmysqld/.deps/lib_sql.Po
+libmysqld/.deps/libmysql.Po
+libmysqld/.deps/libmysqld.Po
+libmysqld/.deps/lock.Po
+libmysqld/.deps/log.Po
+libmysqld/.deps/log_event.Po
+libmysqld/.deps/my_decimal.Po
+libmysqld/.deps/my_time.Po
+libmysqld/.deps/my_user.Po
+libmysqld/.deps/net_serv.Po
+libmysqld/.deps/opt_range.Po
+libmysqld/.deps/opt_sum.Po
+libmysqld/.deps/pack.Po
+libmysqld/.deps/parse_file.Po
+libmysqld/.deps/partition_info.Po
+libmysqld/.deps/password.Po
+libmysqld/.deps/procedure.Po
+libmysqld/.deps/protocol.Po
+libmysqld/.deps/records.Po
+libmysqld/.deps/rpl_filter.Po
+libmysqld/.deps/rpl_injector.Po
+libmysqld/.deps/set_var.Po
+libmysqld/.deps/sp.Po
+libmysqld/.deps/sp_cache.Po
+libmysqld/.deps/sp_head.Po
+libmysqld/.deps/sp_pcontext.Po
+libmysqld/.deps/sp_rcontext.Po
+libmysqld/.deps/spatial.Po
+libmysqld/.deps/sql_acl.Po
+libmysqld/.deps/sql_analyse.Po
+libmysqld/.deps/sql_base.Po
+libmysqld/.deps/sql_builtin.Po
+libmysqld/.deps/sql_cache.Po
+libmysqld/.deps/sql_class.Po
+libmysqld/.deps/sql_crypt.Po
+libmysqld/.deps/sql_cursor.Po
+libmysqld/.deps/sql_db.Po
+libmysqld/.deps/sql_delete.Po
+libmysqld/.deps/sql_truncate.Po
+libmysqld/.deps/sql_reload.Po
+libmysqld/.deps/datadict.Po
+libmysqld/.deps/sql_derived.Po
+libmysqld/.deps/sql_do.Po
+libmysqld/.deps/sql_error.Po
+libmysqld/.deps/sql_handler.Po
+libmysqld/.deps/sql_help.Po
+libmysqld/.deps/sql_insert.Po
+libmysqld/.deps/sql_lex.Po
+libmysqld/.deps/sql_list.Po
+libmysqld/.deps/sql_load.Po
+libmysqld/.deps/sql_manager.Po
+libmysqld/.deps/sql_map.Po
+libmysqld/.deps/sql_parse.Po
+libmysqld/.deps/sql_partition.Po
+libmysqld/.deps/sql_plugin.Po
+libmysqld/.deps/sql_prepare.Po
+libmysqld/.deps/sql_rename.Po
+libmysqld/.deps/sql_select.Po
+libmysqld/.deps/sql_show.Po
+libmysqld/.deps/sql_state.Po
+libmysqld/.deps/sql_string.Po
+libmysqld/.deps/sql_table.Po
+libmysqld/.deps/sql_tablespace.Po
+libmysqld/.deps/sql_test.Po
+libmysqld/.deps/sql_trigger.Po
+libmysqld/.deps/sql_udf.Po
+libmysqld/.deps/sql_union.Po
+libmysqld/.deps/sql_update.Po
+libmysqld/.deps/sql_view.Po
+libmysqld/.deps/sql_yacc.Po
+libmysqld/.deps/stacktrace.Po
+libmysqld/.deps/strfunc.Po
+libmysqld/.deps/table.Po
+libmysqld/.deps/thr_malloc.Po
+libmysqld/.deps/time.Po
+libmysqld/.deps/tztime.Po
+libmysqld/.deps/uniques.Po
+libmysqld/.deps/unireg.Po
+libmysqld/backup_dir
+libmysqld/client.c
+libmysqld/client_settings.h
+libmysqld/cmake_dummy.c
+libmysqld/convert.cc
+libmysqld/derror.cc
+libmysqld/discover.cc
+libmysqld/emb_qcache.cpp
+libmysqld/errmsg.c
+libmysqld/event.cc
+libmysqld/event_data_objects.cc
+libmysqld/event_db_repository.cc
+libmysqld/event_executor.cc
+libmysqld/event_queue.cc
+libmysqld/event_scheduler.cc
+libmysqld/event_timed.cc
+libmysqld/events.cc
+libmysqld/examples/.deps/completion_hash.Po
+libmysqld/examples/.deps/mysql.Po
+libmysqld/examples/.deps/mysql_client_test.Po
+libmysqld/examples/.deps/mysqltest.Po
+libmysqld/examples/.deps/readline.Po
+libmysqld/examples/client_test.c
+libmysqld/examples/client_test.cc
+libmysqld/examples/completion_hash.cc
+libmysqld/examples/completion_hash.h
+libmysqld/examples/link_sources
+libmysqld/examples/my_readline.h
+libmysqld/examples/mysql
+libmysqld/examples/mysql.cc
+libmysqld/examples/mysql_client_test.c
+libmysqld/examples/mysql_client_test_embedded
+libmysqld/examples/mysqltest
+libmysqld/examples/mysqltest.c
+libmysqld/examples/mysqltest_embedded
+libmysqld/examples/readline.cc
+libmysqld/examples/sql_string.cc
+libmysqld/examples/sql_string.h
+libmysqld/examples/test-gdbinit
+libmysqld/field.cc
+libmysqld/field_conv.cc
+libmysqld/filesort.cc
+libmysqld/get_password.c
+libmysqld/gstream.cc
+libmysqld/ha_archive.cc
+libmysqld/ha_berkeley.cc
+libmysqld/ha_blackhole.cc
+libmysqld/ha_example.cc
+libmysqld/ha_federated.cc
+libmysqld/ha_heap.cc
+libmysqld/ha_innobase.cc
+libmysqld/ha_innodb.cc
+libmysqld/ha_isam.cc
+libmysqld/ha_isammrg.cc
+libmysqld/ha_myisam.cc
+libmysqld/ha_myisammrg.cc
+libmysqld/ha_ndbcluster.cc
+libmysqld/ha_ndbcluster_binlog.cc
+libmysqld/ha_ndbcluster_cond.cc
+libmysqld/ha_partition.cc
+libmysqld/ha_tina.cc
+libmysqld/handler.cc
+libmysqld/handlerton.cc
+libmysqld/hash_filo.cc
+libmysqld/hostname.cc
+libmysqld/init.cc
+libmysqld/item.cc
+libmysqld/item_buff.cc
+libmysqld/item_cmpfunc.cc
+libmysqld/item_create.cc
+libmysqld/item_func.cc
+libmysqld/item_geofunc.cc
+libmysqld/item_row.cc
+libmysqld/item_strfunc.cc
+libmysqld/item_subselect.cc
+libmysqld/item_sum.cc
+libmysqld/item_timefunc.cc
+libmysqld/item_uniq.cc
+libmysqld/key.cc
+libmysqld/lex_hash.h
+libmysqld/lib_sql.cpp
+libmysqld/libmysql.c
+libmysqld/link_sources
+libmysqld/lock.cc
+libmysqld/log.cc
+libmysqld/log_event.cc
+libmysqld/log_event_old.cc
+libmysqld/md5.c
+libmysqld/message.h
+libmysqld/message.rc
+libmysqld/mf_iocache.cc
+libmysqld/mini_client.cc
+libmysqld/my_decimal.cc
+libmysqld/my_time.c
+libmysqld/my_user.c
+libmysqld/net_pkg.cc
+libmysqld/net_serv.cc
+libmysqld/opt_ft.cc
+libmysqld/opt_range.cc
+libmysqld/opt_sum.cc
+libmysqld/pack.c
+libmysqld/parse_file.cc
+libmysqld/partition_info.cc
+libmysqld/password.c
+libmysqld/procedure.cc
+libmysqld/protocol.cc
+libmysqld/protocol_cursor.cc
+libmysqld/records.cc
+libmysqld/repl_failsafe.cc
+libmysqld/rpl_filter.cc
+libmysqld/rpl_handler.cc
+libmysqld/rpl_injector.cc
+libmysqld/rpl_record.cc
+libmysqld/rpl_record_old.cc
+libmysqld/rpl_utility.cc
+libmysqld/scheduler.cc
+libmysqld/set_var.cc
+libmysqld/sha2.cc
+libmysqld/simple-test
+libmysqld/slave.cc
+libmysqld/sp.cc
+libmysqld/sp_cache.cc
+libmysqld/sp_head.cc
+libmysqld/sp_pcontext.cc
+libmysqld/sp_rcontext.cc
+libmysqld/spatial.cc
+libmysqld/sql_acl.cc
+libmysqld/sql_analyse.cc
+libmysqld/sql_base.cc
+libmysqld/sql_builtin.cc
+libmysqld/sql_cache.cc
+libmysqld/sql_class.cc
+libmysqld/sql_command
+libmysqld/sql_connect.cc
+libmysqld/sql_crypt.cc
+libmysqld/sql_cursor.cc
+libmysqld/sql_cursor.h
+libmysqld/sql_db.cc
+libmysqld/sql_delete.cc
+libmysqld/sql_truncate.cc
+libmysqld/sql_reload.cc
+libmysqld/datadict.cc
+libmysqld/sql_derived.cc
+libmysqld/sql_do.cc
+libmysqld/sql_error.cc
+libmysqld/sql_handler.cc
+libmysqld/sql_help.cc
+libmysqld/sql_insert.cc
+libmysqld/sql_lex.cc
+libmysqld/sql_list.cc
+libmysqld/sql_load.cc
+libmysqld/sql_locale.cc
+libmysqld/sql_manager.cc
+libmysqld/sql_map.cc
+libmysqld/sql_olap.cc
+libmysqld/sql_parse.cc
+libmysqld/sql_partition.cc
+libmysqld/sql_plugin.cc
+libmysqld/sql_prepare.cc
+libmysqld/sql_profile.cc
+libmysqld/sql_rename.cc
+libmysqld/sql_repl.cc
+libmysqld/sql_select.cc
+libmysqld/sql_servers.cc
+libmysqld/sql_show.cc
+libmysqld/sql_state.c
+libmysqld/sql_string.cc
+libmysqld/sql_table.cc
+libmysqld/sql_tablespace.cc
+libmysqld/sql_test.cc
+libmysqld/sql_trigger.cc
+libmysqld/sql_udf.cc
+libmysqld/sql_union.cc
+libmysqld/sql_unions.cc
+libmysqld/sql_update.cc
+libmysqld/sql_view.cc
+libmysqld/sql_yacc.cc
+libmysqld/sql_yacc.cpp
+libmysqld/sql_yacc.h
+libmysqld/stacktrace.c
+libmysqld/strfunc.cc
+libmysqld/table.cc
+libmysqld/thr_malloc.cc
+libmysqld/sql_time.cc
+libmysqld/tztime.cc
+libmysqld/uniques.cc
+libmysqld/unireg.cc
+libmysqltest/*.ds?
+libmysqltest/*.vcproj
+libmysqltest/mytest.c
+libtool
+linked_client_sources
+linked_include_sources
+linked_libmysql_r_sources
+linked_libmysql_sources
+linked_libmysqld_sources
+linked_libmysqldex_sources
+linked_server_sources
+linked_tools_sources
+locked
+ltmain.sh
+man/*.1
+merge/*.ds?
+merge/*.vcproj
+missing
+mit-pthreads/config.flags
+mit-pthreads/include/bits
+mit-pthreads/include/pthread/machdep.h
+mit-pthreads/include/pthread/posix.h
+mit-pthreads/include/sys
+mit-pthreads/machdep.c
+mit-pthreads/pg++
+mit-pthreads/pgcc
+mit-pthreads/syscall.S
+mkinstalldirs
+my_print_defaults/*.ds?
+my_print_defaults/*.vcproj
+myisam/*.ds?
+myisam/*.vcproj
+myisam/FT1.MYD
+myisam/FT1.MYI
+myisam/ft_dump
+myisam/ft_eval
+myisam/ft_test1
+myisam/ftbench/data
+myisam/ftbench/t
+myisam/ftbench/var/*
+myisam/mi_test1
+myisam/mi_test2
+myisam/mi_test3
+myisam/mi_test_all
+myisam/myisam.log
+myisam/myisam_ftdump
+myisam/myisamchk
+myisam/myisamlog
+myisam/myisampack
+myisam/rt_test
+myisam/rt_test.MYD
+myisam/rt_test.MYI
+myisam/sp_test
+myisam/test1.MYD
+myisam/test1.MYI
+myisam/test2.MYD
+myisam/test2.MYI
+myisam_ftdump/*.ds?
+myisam_ftdump/*.vcproj
+myisamchk/*.ds?
+myisamchk/*.vcproj
+myisamlog/*.ds?
+myisamlog/*.vcproj
+myisammrg/*.ds?
+myisammrg/*.vcproj
+myisampack/*.ds?
+myisampack/*.vcproj
+mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-4.0.2-alpha.tar.gz
+mysql-4.1.8-win-src.zip
+mysql-5.0.2-alpha.tar.gz
+mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-test/*.ds?
+mysql-test/*.vcproj
+mysql-test/.DS_Store
+mysql-test/collections/default.release
+mysql-test/collections/default.release.done
+mysql-test/funcs_1.log
+mysql-test/funcs_1.tar
+mysql-test/gmon.out
+mysql-test/install_test_db
+mysql-test/lib/My/SafeProcess/my_safe_process
+mysql-test/lib/init_db.sql
+mysql-test/linux_sys_vars.inc
+mysql-test/load_sysvars.inc
+mysql-test/mtr
+mysql-test/mysql-test-run
+mysql-test/mysql-test-gcov.err
+mysql-test/mysql-test-gcov.msg
+mysql-test/mysql-test-run-shell
+mysql-test/mysql-test-run.log
+mysql-test/mysql_test_run_new
+mysql-test/ndb/ndbcluster
+mysql-test/partitions.log
+mysql-test/r/*.err
+mysql-test/r/*.log
+mysql-test/r/*.out
+mysql-test/r/*.reject
+mysql-test/r/index_merge_load.result
+mysql-test/r/max_allowed_packet_func.result
+mysql-test/r/rpl000001.eval
+mysql-test/r/rpl000002.eval
+mysql-test/r/rpl000014.eval
+mysql-test/r/rpl000015.eval
+mysql-test/r/rpl000016.eval
+mysql-test/r/rpl_log.eval
+mysql-test/r/slave-running.eval
+mysql-test/r/slave-stopped.eval
+mysql-test/r/tmp.result
+mysql-test/reg.log
+mysql-test/rpl.log
+mysql-test/share/mysql
+mysql-test/std_data/*.pem
+mysql-test/suite/funcs_1.tar.gz
+mysql-test/suite/funcs_1.tar.zip
+mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/innodb_views.warnings
+mysql-test/suite/funcs_1/r/memory_trig_03e.warnings
+mysql-test/suite/funcs_1/r/memory_views.warnings
+mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings
+mysql-test/suite/funcs_1/r/myisam_views.warnings
+mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/ndb_views.warnings
+mysql-test/suite/partitions/r/dif
+mysql-test/suite/partitions/r/diff
+mysql-test/suite/partitions/r/partition.result
+mysql-test/suite/partitions/r/partition_bit_ndb.warnings
+mysql-test/suite/partitions/r/partition_special_innodb.warnings
+mysql-test/suite/partitions/r/partition_special_myisam.warnings
+mysql-test/suite/partitions/r/partition_t55.out
+mysql-test/suite/partitions/r/partition_t55.refout
+mysql-test/suite/partitions/t/partition.test
+mysql-test/t/index_merge.load
+mysql-test/t/tmp.test
+mysql-test/var
+mysql-test/var/*
+mysql-test/windows_sys_vars.inc
+mysql.kdevprj
+mysql.proj
+sql_priv.h
+mysqlbinlog/*.ds?
+mysqlbinlog/*.vcproj
+mysqlcheck/*.ds?
+mysqlcheck/*.vcproj
+mysqld.S
+mysqld.sym
+mysqldemb/*.ds?
+mysqldemb/*.vcproj
+mysqlserver/*.ds?
+mysqlserver/*.vcproj
+mysys/#mf_iocache.c#
+mysys/*.ds?
+mysys/*.vcproj
+mysys/.deps/array.Po
+mysys/.deps/base64.Po
+mysys/.deps/charset-def.Po
+mysys/.deps/charset.Po
+mysys/.deps/checksum.Po
+mysys/.deps/default.Po
+mysys/.deps/default_modify.Po
+mysys/.deps/errors.Po
+mysys/.deps/hash.Po
+mysys/.deps/list.Po
+mysys/.deps/md5.Po
+mysys/.deps/mf_brkhant.Po
+mysys/.deps/mf_cache.Po
+mysys/.deps/mf_dirname.Po
+mysys/.deps/mf_fn_ext.Po
+mysys/.deps/mf_format.Po
+mysys/.deps/mf_getdate.Po
+mysys/.deps/mf_iocache.Po
+mysys/.deps/mf_iocache2.Po
+mysys/.deps/mf_keycache.Po
+mysys/.deps/mf_keycaches.Po
+mysys/.deps/mf_loadpath.Po
+mysys/.deps/mf_pack.Po
+mysys/.deps/mf_path.Po
+mysys/.deps/mf_qsort.Po
+mysys/.deps/mf_qsort2.Po
+mysys/.deps/mf_radix.Po
+mysys/.deps/mf_same.Po
+mysys/.deps/mf_sort.Po
+mysys/.deps/mf_strip.Po
+mysys/.deps/mf_tempdir.Po
+mysys/.deps/mf_tempfile.Po
+mysys/.deps/mf_unixpath.Po
+mysys/.deps/mf_wcomp.Po
+mysys/.deps/mf_wfile.Po
+mysys/.deps/mulalloc.Po
+mysys/.deps/my_access.Po
+mysys/.deps/my_aes.Po
+mysys/.deps/my_alarm.Po
+mysys/.deps/my_alloc.Po
+mysys/.deps/my_append.Po
+mysys/.deps/my_atomic.Po
+mysys/.deps/my_bit.Po
+mysys/.deps/my_bitmap.Po
+mysys/.deps/my_chsize.Po
+mysys/.deps/my_clock.Po
+mysys/.deps/my_compress.Po
+mysys/.deps/my_copy.Po
+mysys/.deps/my_crc32.Po
+mysys/.deps/my_create.Po
+mysys/.deps/my_delete.Po
+mysys/.deps/my_div.Po
+mysys/.deps/my_dup.Po
+mysys/.deps/my_error.Po
+mysys/.deps/my_file.Po
+mysys/.deps/my_fopen.Po
+mysys/.deps/my_fstream.Po
+mysys/.deps/my_gethostbyname.Po
+mysys/.deps/my_gethwaddr.Po
+mysys/.deps/my_getncpus.Po
+mysys/.deps/my_getopt.Po
+mysys/.deps/my_getsystime.Po
+mysys/.deps/my_getwd.Po
+mysys/.deps/my_handler.Po
+mysys/.deps/my_init.Po
+mysys/.deps/my_largepage.Po
+mysys/.deps/my_lib.Po
+mysys/.deps/my_libwrap.Po
+mysys/.deps/my_lock.Po
+mysys/.deps/my_lockmem.Po
+mysys/.deps/my_lread.Po
+mysys/.deps/my_lwrite.Po
+mysys/.deps/my_malloc.Po
+mysys/.deps/my_memmem.Po
+mysys/.deps/my_messnc.Po
+mysys/.deps/my_mkdir.Po
+mysys/.deps/my_mmap.Po
+mysys/.deps/my_net.Po
+mysys/.deps/my_netware.Po
+mysys/.deps/my_new.Po
+mysys/.deps/my_once.Po
+mysys/.deps/my_open.Po
+mysys/.deps/my_port.Po
+mysys/.deps/my_pread.Po
+mysys/.deps/my_pthread.Po
+mysys/.deps/my_quick.Po
+mysys/.deps/my_read.Po
+mysys/.deps/my_realloc.Po
+mysys/.deps/my_redel.Po
+mysys/.deps/my_rename.Po
+mysys/.deps/my_seek.Po
+mysys/.deps/my_semaphore.Po
+mysys/.deps/my_sleep.Po
+mysys/.deps/my_static.Po
+mysys/.deps/my_symlink.Po
+mysys/.deps/my_symlink2.Po
+mysys/.deps/my_sync.Po
+mysys/.deps/my_thr_init.Po
+mysys/.deps/my_vle.Po
+mysys/.deps/my_windac.Po
+mysys/.deps/my_write.Po
+mysys/.deps/ptr_cmp.Po
+mysys/.deps/queues.Po
+mysys/.deps/rijndael.Po
+mysys/.deps/safemalloc.Po
+mysys/.deps/sha1.Po
+mysys/.deps/string.Po
+mysys/.deps/thr_alarm.Po
+mysys/.deps/thr_lock.Po
+mysys/.deps/thr_mutex.Po
+mysys/.deps/thr_rwlock.Po
+mysys/.deps/tree.Po
+mysys/.deps/trie.Po
+mysys/.deps/typelib.Po
+mysys/charset2html
+mysys/getopt.c
+mysys/getopt1.c
+mysys/main.cc
+mysys/my_new.cpp
+mysys/raid.cpp
+mysys/ste5KbMa
+mysys/test_atomic
+mysys/test_bitmap
+mysys/test_charset
+mysys/test_dir
+mysys/test_gethwaddr
+mysys/test_io_cache
+mysys/test_thr_alarm
+mysys/test_thr_lock
+mysys/test_vsnprintf
+mysys/testhash
+ndb/bin/DbAsyncGenerator
+ndb/bin/DbCreate
+ndb/bin/acid
+ndb/bin/async-lmc-bench-l-p10.sh
+ndb/bin/async-lmc-bench-l.sh
+ndb/bin/async-lmc-bench-p10.sh
+ndb/bin/async-lmc-bench.sh
+ndb/bin/atrt
+ndb/bin/atrt-analyze-result.sh
+ndb/bin/atrt-clear-result.sh
+ndb/bin/atrt-gather-result.sh
+ndb/bin/atrt-setup.sh
+ndb/bin/bankCreator
+ndb/bin/bankMakeGL
+ndb/bin/bankSumAccounts
+ndb/bin/bankTimer
+ndb/bin/bankTransactionMaker
+ndb/bin/bankValidateAllGLs
+ndb/bin/basicTransporterTest
+ndb/bin/benchronja
+ndb/bin/bulk_copy
+ndb/bin/copy_tab
+ndb/bin/create_all_tabs
+ndb/bin/create_index
+ndb/bin/create_tab
+ndb/bin/delete_all
+ndb/bin/desc
+ndb/bin/drop_all_tabs
+ndb/bin/drop_index
+ndb/bin/drop_tab
+ndb/bin/flexAsynch
+ndb/bin/flexBench
+ndb/bin/flexHammer
+ndb/bin/flexScan
+ndb/bin/flexTT
+ndb/bin/hugoCalculator
+ndb/bin/hugoFill
+ndb/bin/hugoLoad
+ndb/bin/hugoLockRecords
+ndb/bin/hugoPkDelete
+ndb/bin/hugoPkRead
+ndb/bin/hugoPkReadRecord
+ndb/bin/hugoPkUpdate
+ndb/bin/hugoScanRead
+ndb/bin/hugoScanUpdate
+ndb/bin/index
+ndb/bin/index2
+ndb/bin/initronja
+ndb/bin/interpreterInTup
+ndb/bin/list_tables
+ndb/bin/make-config.sh
+ndb/bin/mgmtclient
+ndb/bin/mgmtsrvr
+ndb/bin/mkconfig
+ndb/bin/ndb
+ndb/bin/ndb_cpcc
+ndb/bin/ndb_cpcd
+ndb/bin/ndb_rep
+ndb/bin/ndbsql
+ndb/bin/newton_basic
+ndb/bin/newton_br
+ndb/bin/newton_pb
+ndb/bin/newton_perf
+ndb/bin/perfTransporterTest
+ndb/bin/printConfig
+ndb/bin/printSchemafile
+ndb/bin/printSysfile
+ndb/bin/redoLogFileReader
+ndb/bin/restart
+ndb/bin/restarter
+ndb/bin/restarter2
+ndb/bin/restarts
+ndb/bin/restore
+ndb/bin/select_all
+ndb/bin/select_count
+ndb/bin/telco
+ndb/bin/testBackup
+ndb/bin/testBank
+ndb/bin/testBasic
+ndb/bin/testBasicAsynch
+ndb/bin/testCopy
+ndb/bin/testDataBuffers
+ndb/bin/testDict
+ndb/bin/testGrep
+ndb/bin/testGrepVerify
+ndb/bin/testIndex
+ndb/bin/testInterpreter
+ndb/bin/testKernelDataBuffer
+ndb/bin/testLongSig
+ndb/bin/testMgm
+ndb/bin/testMgmapi
+ndb/bin/testNdbApi
+ndb/bin/testNodeRestart
+ndb/bin/testOIBasic
+ndb/bin/testOdbcDriver
+ndb/bin/testOperations
+ndb/bin/testRestartGci
+ndb/bin/testScan
+ndb/bin/testScanInterpreter
+ndb/bin/testSimplePropertiesSection
+ndb/bin/testSystemRestart
+ndb/bin/testTimeout
+ndb/bin/testTransactions
+ndb/bin/test_cpcd
+ndb/bin/test_event
+ndb/bin/verify_index
+ndb/bin/waiter
+ndb/config/autom4te.cache/*
+ndb/config/config.mk
+ndb/examples/ndbapi_example1/ndbapi_example1
+ndb/examples/ndbapi_example2/ndbapi_example2
+ndb/examples/ndbapi_example3/ndbapi_example3
+ndb/examples/ndbapi_example5/ndbapi_example5
+ndb/examples/select_all/select_all
+ndb/include/ndb_global.h
+ndb/include/ndb_types.h
+ndb/include/ndb_version.h
+ndb/lib/libMGM_API.so
+ndb/lib/libNDB_API.so
+ndb/lib/libNDB_ODBC.so
+ndb/lib/libNEWTON_API.so
+ndb/lib/libNEWTON_BASICTEST_COMMON.so
+ndb/lib/libREP_API.so
+ndb/lib/libndbclient.so
+ndb/lib/libndbclient_extra.so
+ndb/src/common/debugger/libtrace.dsp
+ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
+ndb/src/common/logger/liblogger.dsp
+ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
+ndb/src/common/mgmcommon/printConfig/*.d
+ndb/src/common/portlib/libportlib.dsp
+ndb/src/common/transporter/libtransporter.dsp
+ndb/src/common/util/libgeneral.dsp
+ndb/src/common/util/testBitmask.cpp
+ndb/src/cw/cpcd/ndb_cpcd
+ndb/src/dummy.cpp
+ndb/src/kernel/blocks/backup/libbackup.dsp
+ndb/src/kernel/blocks/backup/restore/ndb_restore
+ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
+ndb/src/kernel/blocks/dbacc/libdbacc.dsp
+ndb/src/kernel/blocks/dbdict/libdbdict.dsp
+ndb/src/kernel/blocks/dbdih/libdbdih.dsp
+ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+ndb/src/kernel/blocks/dbtc/libdbtc.dsp
+ndb/src/kernel/blocks/dbtup/libdbtup.dsp
+ndb/src/kernel/blocks/dbtux/libdbtux.dsp
+ndb/src/kernel/blocks/dbutil/libdbutil.dsp
+ndb/src/kernel/blocks/grep/libgrep.dsp
+ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
+ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
+ndb/src/kernel/blocks/qmgr/libqmgr.dsp
+ndb/src/kernel/blocks/suma/libsuma.dsp
+ndb/src/kernel/blocks/trix/libtrix.dsp
+ndb/src/kernel/error/liberror.dsp
+ndb/src/kernel/ndbd
+ndb/src/kernel/ndbd.dsp
+ndb/src/kernel/vm/libkernel.dsp
+ndb/src/libndb.ver
+ndb/src/libndbclient.dsp
+ndb/src/mgmapi/libmgmapi.dsp
+ndb/src/mgmclient/libndbmgmclient.dsp
+ndb/src/mgmclient/ndb_mgm
+ndb/src/mgmclient/ndb_mgm.dsp
+ndb/src/mgmclient/test_cpcd/*.d
+ndb/src/mgmsrv/ndb_mgmd
+ndb/src/mgmsrv/ndb_mgmd.dsp
+ndb/src/ndbapi/libndbapi.dsp
+ndb/test/ndbapi/bank/bankCreator
+ndb/test/ndbapi/bank/bankMakeGL
+ndb/test/ndbapi/bank/bankSumAccounts
+ndb/test/ndbapi/bank/bankTimer
+ndb/test/ndbapi/bank/bankTransactionMaker
+ndb/test/ndbapi/bank/bankValidateAllGLs
+ndb/test/ndbapi/bank/testBank
+ndb/test/ndbapi/create_all_tabs
+ndb/test/ndbapi/create_tab
+ndb/test/ndbapi/drop_all_tabs
+ndb/test/ndbapi/flexAsynch
+ndb/test/ndbapi/flexBench
+ndb/test/ndbapi/flexBench.dsp
+ndb/test/ndbapi/flexHammer
+ndb/test/ndbapi/flexTT
+ndb/test/ndbapi/testBackup
+ndb/test/ndbapi/testBasic
+ndb/test/ndbapi/testBasic.dsp
+ndb/test/ndbapi/testBasicAsynch
+ndb/test/ndbapi/testBlobs
+ndb/test/ndbapi/testBlobs.dsp
+ndb/test/ndbapi/testDataBuffers
+ndb/test/ndbapi/testDeadlock
+ndb/test/ndbapi/testDict
+ndb/test/ndbapi/testIndex
+ndb/test/ndbapi/testMgm
+ndb/test/ndbapi/testNdbApi
+ndb/test/ndbapi/testNodeRestart
+ndb/test/ndbapi/testOIBasic
+ndb/test/ndbapi/testOperations
+ndb/test/ndbapi/testRestartGci
+ndb/test/ndbapi/testSRBank
+ndb/test/ndbapi/testScan
+ndb/test/ndbapi/testScan.dsp
+ndb/test/ndbapi/testScanInterpreter
+ndb/test/ndbapi/testScanPerf
+ndb/test/ndbapi/testSystemRestart
+ndb/test/ndbapi/testTimeout
+ndb/test/ndbapi/testTransactions
+ndb/test/ndbapi/test_event
+ndb/test/run-test/atrt
+ndb/test/src/libNDBT.dsp
+ndb/test/tools/copy_tab
+ndb/test/tools/create_index
+ndb/test/tools/hugoCalculator
+ndb/test/tools/hugoFill
+ndb/test/tools/hugoLoad
+ndb/test/tools/hugoLockRecords
+ndb/test/tools/hugoPkDelete
+ndb/test/tools/hugoPkRead
+ndb/test/tools/hugoPkReadRecord
+ndb/test/tools/hugoPkUpdate
+ndb/test/tools/hugoScanRead
+ndb/test/tools/hugoScanUpdate
+ndb/test/tools/ndb_cpcc
+ndb/test/tools/restart
+ndb/test/tools/verify_index
+ndb/tools/ndb_config
+ndb/tools/ndb_delete_all
+ndb/tools/ndb_delete_all.dsp
+ndb/tools/ndb_desc
+ndb/tools/ndb_desc.dsp
+ndb/tools/ndb_drop_index
+ndb/tools/ndb_drop_index.dsp
+ndb/tools/ndb_drop_table
+ndb/tools/ndb_drop_table.dsp
+ndb/tools/ndb_restore
+ndb/tools/ndb_select_all
+ndb/tools/ndb_select_all.dsp
+ndb/tools/ndb_select_count
+ndb/tools/ndb_select_count.dsp
+ndb/tools/ndb_show_tables
+ndb/tools/ndb_show_tables.dsp
+ndb/tools/ndb_test_platform
+ndb/tools/ndb_waiter
+ndb/tools/ndb_waiter.dsp
+ndbcluster-1186
+ndbcluster-1186/SCCS
+ndbcluster-1186/config.ini
+ndbcluster-1186/ndb_1.pid
+ndbcluster-1186/ndb_1_out.log
+ndbcluster-1186/ndb_1_signal.log
+ndbcluster-1186/ndb_2.pid
+ndbcluster-1186/ndb_2_out.log
+ndbcluster-1186/ndb_2_signal.log
+ndbcluster-1186/ndb_3.pid
+ndbcluster-1186/ndb_3_cluster.log
+ndbcluster-1186/ndb_3_out.log
+ndbcluster-1186/ndbcluster.pid
+netware/.deps/libmysqlmain.Po
+netware/.deps/my_manage.Po
+netware/.deps/mysql_install_db.Po
+netware/.deps/mysql_test_run.Po
+netware/.deps/mysqld_safe.Po
+netware/init_db.sql
+netware/libmysql.imp
+netware/test_db.sql
+pack_isam/*.ds?
+perror/*.ds?
+perror/*.vcproj
+plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo
+plugin/fulltext/.libs/mypluglib.lai
+plugin/fulltext/.libs/mypluglib.so.0
+plugin/fulltext/.libs/mypluglib.so.0.0.0
+pstack/.deps/bucomm.Po
+pstack/.deps/debug.Po
+pstack/.deps/filemode.Po
+pstack/.deps/ieee.Po
+pstack/.deps/linuxthreads.Po
+pstack/.deps/pstack.Po
+pstack/.deps/rddbg.Po
+pstack/.deps/stabs.Po
+pull.log
+regex/*.ds?
+regex/*.vcproj
+regex/.deps/debug.Po
+regex/.deps/main.Po
+regex/.deps/regcomp.Po
+regex/.deps/regerror.Po
+regex/.deps/regexec.Po
+regex/.deps/regfree.Po
+regex/.deps/reginit.Po
+regex/.deps/split.Po
+regex/re
+repl-tests/test-repl-ts/repl-timestamp.master.reject
+repl-tests/test-repl/foo-dump-slave.master.
+repl-tests/test-repl/sum-wlen-slave.master.
+repl-tests/test-repl/sum-wlen-slave.master.re
+repl-tests/test-repl/sum-wlen-slave.master.reje
+replace/*.ds?
+replace/*.vcproj
+scripts/comp_sql
+scripts/fill_func_tables
+scripts/fill_func_tables.sql
+scripts/fill_help_tables
+scripts/fill_help_tables.sql
+scripts/make_binary_distribution
+scripts/make_sharedlib_distribution
+scripts/make_win_binary_distribution
+scripts/make_win_src_distribution
+scripts/make_win_src_distribution_old
+scripts/msql2mysql
+scripts/mysql_config
+scripts/mysql_convert_table_format
+scripts/mysql_create_system_tables
+scripts/mysql_explain_log
+scripts/mysql_find_rows
+scripts/mysql_fix_extensions
+scripts/mysql_fix_privilege_tables
+scripts/mysql_fix_privilege_tables.sql
+scripts/mysql_fix_privilege_tables.sql.rule
+scripts/mysql_fix_privilege_tables_sql.c
+scripts/mysql_fix_privilege_tables_sql.c.rule
+scripts/mysql_install_db
+scripts/mysql_secure_installation
+scripts/mysql_setpermission
+scripts/mysql_tableinfo
+scripts/mysql_upgrade
+scripts/mysql_upgrade_shell
+scripts/mysql_zap
+scripts/mysqlaccess
+scripts/mysqlbug
+scripts/mysqld_multi
+scripts/mysqld_safe
+scripts/mysqldumpslow
+scripts/mysqlhotcopy
+scripts/mysqlhotcopy.sh.rej
+scripts/safe_mysqld
+select_test
+server-tools/instance-manager/.deps/buffer.Po
+server-tools/instance-manager/.deps/command.Po
+server-tools/instance-manager/.deps/commands.Po
+server-tools/instance-manager/.deps/guardian.Po
+server-tools/instance-manager/.deps/instance.Po
+server-tools/instance-manager/.deps/instance_map.Po
+server-tools/instance-manager/.deps/instance_options.Po
+server-tools/instance-manager/.deps/liboptions_la-options.Plo
+server-tools/instance-manager/.deps/liboptions_la-priv.Plo
+server-tools/instance-manager/.deps/listener.Po
+server-tools/instance-manager/.deps/log.Po
+server-tools/instance-manager/.deps/manager.Po
+server-tools/instance-manager/.deps/messages.Po
+server-tools/instance-manager/.deps/mysql_connection.Po
+server-tools/instance-manager/.deps/mysqlmanager.Po
+server-tools/instance-manager/.deps/net_serv.Po
+server-tools/instance-manager/.deps/parse.Po
+server-tools/instance-manager/.deps/parse_output.Po
+server-tools/instance-manager/.deps/protocol.Po
+server-tools/instance-manager/.deps/thread_registry.Po
+server-tools/instance-manager/.deps/user_management_commands.Po
+server-tools/instance-manager/.deps/user_map.Po
+server-tools/instance-manager/buffer.cpp
+server-tools/instance-manager/client.c
+server-tools/instance-manager/client_settings.h
+server-tools/instance-manager/command.cpp
+server-tools/instance-manager/commands.cpp
+server-tools/instance-manager/errmsg.c
+server-tools/instance-manager/guardian.cpp
+server-tools/instance-manager/instance.cpp
+server-tools/instance-manager/instance_map.cpp
+server-tools/instance-manager/instance_options.cpp
+server-tools/instance-manager/listener.cpp
+server-tools/instance-manager/log.cpp
+server-tools/instance-manager/manager.cpp
+server-tools/instance-manager/messages.cpp
+server-tools/instance-manager/mysql_connection.cpp
+server-tools/instance-manager/mysqlmanager
+server-tools/instance-manager/mysqlmanager.cpp
+server-tools/instance-manager/net_serv.cc
+server-tools/instance-manager/options.cpp
+server-tools/instance-manager/parse.cpp
+server-tools/instance-manager/parse_output.cpp
+server-tools/instance-manager/priv.cpp
+server-tools/instance-manager/protocol.cpp
+server-tools/instance-manager/thr_alarm.c
+server-tools/instance-manager/thread_registry.cpp
+server-tools/instance-manager/user_map.cpp
+sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
+sql-bench/bench-count-distinct
+sql-bench/bench-init.pl
+sql-bench/compare-results
+sql-bench/compare-results-all
+sql-bench/copy-db
+sql-bench/crash-me
+sql-bench/gif/*
+sql-bench/graph-compare-results
+sql-bench/innotest1
+sql-bench/innotest1a
+sql-bench/innotest1b
+sql-bench/innotest2
+sql-bench/innotest2a
+sql-bench/innotest2b
+sql-bench/output/*
+sql-bench/run-all-tests
+sql-bench/server-cfg
+sql-bench/template.html
+sql-bench/test-ATIS
+sql-bench/test-alter-table
+sql-bench/test-big-tables
+sql-bench/test-connect
+sql-bench/test-create
+sql-bench/test-insert
+sql-bench/test-select
+sql-bench/test-transactions
+sql-bench/test-wisconsin
+sql/*.cpp
+sql/*.ds?
+sql/*.def
+sql/*.vcproj
+sql/.deps/client.Po
+sql/.deps/derror.Po
+sql/.deps/des_key_file.Po
+sql/.deps/discover.Po
+sql/.deps/event_data_objects.Po
+sql/.deps/event_db_repository.Po
+sql/.deps/event_queue.Po
+sql/.deps/event_scheduler.Po
+sql/.deps/events.Po
+sql/.deps/field.Po
+sql/.deps/field_conv.Po
+sql/.deps/filesort.Po
+sql/.deps/gen_lex_hash.Po
+sql/.deps/gstream.Po
+sql/.deps/ha_berkeley.Po
+sql/.deps/ha_federated.Po
+sql/.deps/ha_heap.Po
+sql/.deps/ha_innodb.Po
+sql/.deps/ha_myisam.Po
+sql/.deps/ha_myisammrg.Po
+sql/.deps/ha_ndbcluster.Po
+sql/.deps/ha_ndbcluster_binlog.Po
+sql/.deps/ha_partition.Po
+sql/.deps/handler.Po
+sql/.deps/hash_filo.Po
+sql/.deps/hostname.Po
+sql/.deps/init.Po
+sql/.deps/item.Po
+sql/.deps/item_buff.Po
+sql/.deps/item_cmpfunc.Po
+sql/.deps/item_create.Po
+sql/.deps/item_func.Po
+sql/.deps/item_geofunc.Po
+sql/.deps/item_row.Po
+sql/.deps/item_strfunc.Po
+sql/.deps/item_subselect.Po
+sql/.deps/item_sum.Po
+sql/.deps/item_timefunc.Po
+sql/.deps/item_uniq.Po
+sql/.deps/item_xmlfunc.Po
+sql/.deps/key.Po
+sql/.deps/lock.Po
+sql/.deps/log.Po
+sql/.deps/log_event.Po
+sql/.deps/mf_iocache.Po
+sql/.deps/mini_client_errors.Po
+sql/.deps/my_decimal.Po
+sql/.deps/my_lock.Po
+sql/.deps/my_time.Po
+sql/.deps/my_user.Po
+sql/.deps/mysql_tzinfo_to_sql.Po
+sql/.deps/mysqld.Po
+sql/.deps/net_serv.Po
+sql/.deps/opt_range.Po
+sql/.deps/opt_sum.Po
+sql/.deps/pack.Po
+sql/.deps/parse_file.Po
+sql/.deps/partition_info.Po
+sql/.deps/password.Po
+sql/.deps/procedure.Po
+sql/.deps/protocol.Po
+sql/.deps/records.Po
+sql/.deps/repl_failsafe.Po
+sql/.deps/rpl_filter.Po
+sql/.deps/rpl_injector.Po
+sql/.deps/rpl_tblmap.Po
+sql/.deps/set_var.Po
+sql/.deps/slave.Po
+sql/.deps/sp.Po
+sql/.deps/sp_cache.Po
+sql/.deps/sp_head.Po
+sql/.deps/sp_pcontext.Po
+sql/.deps/sp_rcontext.Po
+sql/.deps/spatial.Po
+sql/.deps/sql_acl.Po
+sql/.deps/sql_analyse.Po
+sql/.deps/sql_base.Po
+sql/.deps/sql_binlog.Po
+sql/.deps/sql_builtin.Po
+sql/.deps/sql_cache.Po
+sql/.deps/sql_class.Po
+sql/.deps/sql_client.Po
+sql/.deps/sql_crypt.Po
+sql/.deps/sql_cursor.Po
+sql/.deps/sql_db.Po
+sql/.deps/sql_delete.Po
+sql/.deps/sql_truncate.Po
+sql/.deps/sql_reload.Po
+sql/.deps/datadict.Po
+sql/.deps/sql_derived.Po
+sql/.deps/sql_do.Po
+sql/.deps/sql_error.Po
+sql/.deps/sql_handler.Po
+sql/.deps/sql_help.Po
+sql/.deps/sql_insert.Po
+sql/.deps/sql_lex.Po
+sql/.deps/sql_list.Po
+sql/.deps/sql_load.Po
+sql/.deps/sql_manager.Po
+sql/.deps/sql_map.Po
+sql/.deps/sql_olap.Po
+sql/.deps/sql_parse.Po
+sql/.deps/sql_partition.Po
+sql/.deps/sql_plugin.Po
+sql/.deps/sql_prepare.Po
+sql/.deps/sql_rename.Po
+sql/.deps/sql_repl.Po
+sql/.deps/sql_select.Po
+sql/.deps/sql_show.Po
+sql/.deps/sql_state.Po
+sql/.deps/sql_string.Po
+sql/.deps/sql_table.Po
+sql/.deps/sql_tablespace.Po
+sql/.deps/sql_test.Po
+sql/.deps/sql_trigger.Po
+sql/.deps/sql_udf.Po
+sql/.deps/sql_union.Po
+sql/.deps/sql_update.Po
+sql/.deps/sql_view.Po
+sql/.deps/sql_yacc.Po
+sql/.deps/stacktrace.Po
+sql/.deps/strfunc.Po
+sql/.deps/table.Po
+sql/.deps/thr_malloc.Po
+sql/.deps/time.Po
+sql/.deps/tztime.Po
+sql/.deps/udf_example.Plo
+sql/.deps/uniques.Po
+sql/.deps/unireg.Po
+sql/.gdbinit
+sql/.libs/udf_example.lai
+sql/.libs/udf_example.so.0
+sql/.libs/udf_example.so.0.0.0
+sql/client.c
+sql/cmake_dummy.cc
+sql/Doxyfile
+sql/f.c
+sql/gen_lex_hash
+sql/gmon.out
+sql/handlerton.cc
+sql/html
+sql/latex
+sql/lex_hash.h
+sql/lex_hash.h.rule
+sql/link_sources
+sql/max/*
+sql/message.h
+sql/message.mc
+sql/message.rc
+sql/mini_client_errors.c
+sql/my_time.c
+sql/my_user.c
+sql/mysql_tzinfo_to_sql
+sql/mysql_tzinfo_to_sql.cc
+sql/mysql_tzinfo_to_sql_tztime.cc
+sql/mysqlbinlog
+sql/mysqld
+sql/mysqld-purecov
+sql/mysqld-purify
+sql/mysqld-quantify
+sql/new.cc
+sql/pack.c
+sql/safe_to_cache_query.txt
+sql/share/*.sys
+sql/share/charsets/gmon.out
+sql/share/fixerrmsg.pl
+sql/share/gmon.out
+sql/share/iso639-2.txt
+sql/share/mysql
+sql/share/norwegian-ny/errmsg.sys
+sql/share/norwegian/errmsg.sys
+sql/sql_builtin.cc
+sql/sql_select.cc.orig
+sql/sql_yacc.cc
+sql/sql_yacc.h
+sql/sql_yacc.h.rule
+sql/sql_yacc.output
+sql/sql_yacc.yy.orig
+sql/test_time
+sql/udf_example.so
+sql_error.cc
+sql_prepare.cc
+stamp-h
+stamp-h.in
+stamp-h1
+stamp-h1.in
+stamp-h2
+stamp-h2.in
+stamp-h3
+stamp-h4
+start_mysqld.sh
+storage/archive/.deps/archive_test-archive_test.Po
+storage/archive/.deps/archive_test-azio.Po
+storage/archive/.deps/ha_archive_la-azio.Plo
+storage/archive/.deps/ha_archive_la-ha_archive.Plo
+storage/archive/.deps/libarchive_a-azio.Po
+storage/archive/.deps/libarchive_a-ha_archive.Po
+storage/archive/archive_reader
+storage/archive/archive_test
+storage/bdb/*.ds?
+storage/bdb/*.vcproj
+storage/bdb/README
+storage/bdb/btree/btree_auto.c
+storage/bdb/btree/btree_autop.c
+storage/bdb/build_unix/*
+storage/bdb/build_vxworks/BerkeleyDB20.wpj
+storage/bdb/build_vxworks/BerkeleyDB20small.wpj
+storage/bdb/build_vxworks/BerkeleyDB22.wpj
+storage/bdb/build_vxworks/BerkeleyDB22small.wpj
+storage/bdb/build_vxworks/db.h
+storage/bdb/build_vxworks/db_config.h
+storage/bdb/build_vxworks/db_config_small.h
+storage/bdb/build_vxworks/db_deadlock/db_deadlock20.wpj
+storage/bdb/build_vxworks/db_deadlock/db_deadlock22.wpj
+storage/bdb/build_vxworks/db_int.h
+storage/bdb/build_vxworks/dbdemo/dbdemo.c
+storage/bdb/build_vxworks/dbdemo/dbdemo20.wpj
+storage/bdb/build_vxworks/dbdemo/dbdemo22.wpj
+storage/bdb/build_win32/*.dsp
+storage/bdb/build_win32/*.h
+storage/bdb/build_win32/db.h
+storage/bdb/build_win32/db_archive.dsp
+storage/bdb/build_win32/db_checkpoint.dsp
+storage/bdb/build_win32/db_config.h
+storage/bdb/build_win32/db_cxx.h
+storage/bdb/build_win32/db_deadlock.dsp
+storage/bdb/build_win32/db_dll.dsp
+storage/bdb/build_win32/db_dump.dsp
+storage/bdb/build_win32/db_int.h
+storage/bdb/build_win32/db_java.dsp
+storage/bdb/build_win32/db_load.dsp
+storage/bdb/build_win32/db_perf.dsp
+storage/bdb/build_win32/db_printlog.dsp
+storage/bdb/build_win32/db_recover.dsp
+storage/bdb/build_win32/db_stat.dsp
+storage/bdb/build_win32/db_static.dsp
+storage/bdb/build_win32/db_tcl.dsp
+storage/bdb/build_win32/db_test.dsp
+storage/bdb/build_win32/db_upgrade.dsp
+storage/bdb/build_win32/db_verify.dsp
+storage/bdb/build_win32/ex_access.dsp
+storage/bdb/build_win32/ex_btrec.dsp
+storage/bdb/build_win32/ex_env.dsp
+storage/bdb/build_win32/ex_lock.dsp
+storage/bdb/build_win32/ex_mpool.dsp
+storage/bdb/build_win32/ex_tpcb.dsp
+storage/bdb/build_win32/excxx_access.dsp
+storage/bdb/build_win32/excxx_btrec.dsp
+storage/bdb/build_win32/excxx_env.dsp
+storage/bdb/build_win32/excxx_lock.dsp
+storage/bdb/build_win32/excxx_mpool.dsp
+storage/bdb/build_win32/excxx_tpcb.dsp
+storage/bdb/build_win32/include.tcl
+storage/bdb/build_win32/libdb.def
+storage/bdb/build_win32/libdb.rc
+storage/bdb/build_win64/*.dsp
+storage/bdb/build_win64/*.dsw
+storage/bdb/build_win64/*.h
+storage/bdb/db/crdel_auto.c
+storage/bdb/db/crdel_autop.c
+storage/bdb/db/db_auto.c
+storage/bdb/db/db_autop.c
+storage/bdb/dbinc_auto/*.*
+storage/bdb/dbreg/dbreg_auto.c
+storage/bdb/dbreg/dbreg_autop.c
+storage/bdb/dist/autom4te-2.53.cache/*
+storage/bdb/dist/autom4te-2.53.cache/output.0
+storage/bdb/dist/autom4te-2.53.cache/requests
+storage/bdb/dist/autom4te-2.53.cache/traces.0
+storage/bdb/dist/autom4te.cache/*
+storage/bdb/dist/autom4te.cache/output.0
+storage/bdb/dist/autom4te.cache/requests
+storage/bdb/dist/autom4te.cache/traces.0
+storage/bdb/dist/config.hin
+storage/bdb/dist/configure
+storage/bdb/dist/tags
+storage/bdb/dist/template/db_server_proc
+storage/bdb/dist/template/gen_client_ret
+storage/bdb/dist/template/rec_btree
+storage/bdb/dist/template/rec_crdel
+storage/bdb/dist/template/rec_db
+storage/bdb/dist/template/rec_dbreg
+storage/bdb/dist/template/rec_fileops
+storage/bdb/dist/template/rec_hash
+storage/bdb/dist/template/rec_log
+storage/bdb/dist/template/rec_qam
+storage/bdb/dist/template/rec_txn
+storage/bdb/examples_c/ex_apprec/ex_apprec_auto.c
+storage/bdb/examples_c/ex_apprec/ex_apprec_auto.h
+storage/bdb/examples_c/ex_apprec/ex_apprec_template
+storage/bdb/examples_java
+storage/bdb/fileops/fileops_auto.c
+storage/bdb/fileops/fileops_autop.c
+storage/bdb/hash/hash_auto.c
+storage/bdb/hash/hash_autop.c
+storage/bdb/include/btree_auto.h
+storage/bdb/include/btree_ext.h
+storage/bdb/include/clib_ext.h
+storage/bdb/include/common_ext.h
+storage/bdb/include/crdel_auto.h
+storage/bdb/include/db_auto.h
+storage/bdb/include/db_ext.h
+storage/bdb/include/db_server.h
+storage/bdb/include/env_ext.h
+storage/bdb/include/gen_client_ext.h
+storage/bdb/include/gen_server_ext.h
+storage/bdb/include/hash_auto.h
+storage/bdb/include/hash_ext.h
+storage/bdb/include/lock_ext.h
+storage/bdb/include/log_auto.h
+storage/bdb/include/log_ext.h
+storage/bdb/include/mp_ext.h
+storage/bdb/include/mutex_ext.h
+storage/bdb/include/os_ext.h
+storage/bdb/include/qam_auto.h
+storage/bdb/include/qam_ext.h
+storage/bdb/include/rpc_client_ext.h
+storage/bdb/include/rpc_server_ext.h
+storage/bdb/include/tcl_ext.h
+storage/bdb/include/txn_auto.h
+storage/bdb/include/txn_ext.h
+storage/bdb/include/xa_ext.h
+storage/bdb/java/src/com/sleepycat/db/Db.java
+storage/bdb/java/src/com/sleepycat/db/DbBtreeStat.java
+storage/bdb/java/src/com/sleepycat/db/DbConstants.java
+storage/bdb/java/src/com/sleepycat/db/DbHashStat.java
+storage/bdb/java/src/com/sleepycat/db/DbLockStat.java
+storage/bdb/java/src/com/sleepycat/db/DbLogStat.java
+storage/bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+storage/bdb/java/src/com/sleepycat/db/DbQueueStat.java
+storage/bdb/java/src/com/sleepycat/db/DbRepStat.java
+storage/bdb/java/src/com/sleepycat/db/DbTxnStat.java
+storage/bdb/libdb_java/java_stat_auto.c
+storage/bdb/libdb_java/java_stat_auto.h
+storage/bdb/libdb_java/java_util.i
+storage/bdb/log/log_auto.c
+storage/bdb/qam/qam_auto.c
+storage/bdb/qam/qam_autop.c
+storage/bdb/rep/rep_auto.c
+storage/bdb/rep/rep_autop.c
+storage/bdb/rpc_client/db_server_clnt.c
+storage/bdb/rpc_client/gen_client.c
+storage/bdb/rpc_server/c/db_server_proc.c
+storage/bdb/rpc_server/c/db_server_proc.sed
+storage/bdb/rpc_server/c/db_server_svc.c
+storage/bdb/rpc_server/c/db_server_xdr.c
+storage/bdb/rpc_server/c/gen_db_server.c
+storage/bdb/rpc_server/db_server.x
+storage/bdb/rpc_server/db_server_proc.sed
+storage/bdb/rpc_server/db_server_svc.c
+storage/bdb/rpc_server/db_server_xdr.c
+storage/bdb/rpc_server/gen_db_server.c
+storage/bdb/test/TESTS
+storage/bdb/test/include.tcl
+storage/bdb/test/logtrack.list
+storage/bdb/txn/txn_auto.c
+storage/bdb/txn/txn_autop.c
+storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo
+storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po
+storage/csv/.deps/ha_csv_la-ha_tina.Plo
+storage/csv/.deps/libcsv_a-ha_tina.Po
+storage/example/.deps/ha_example_la-ha_example.Plo
+storage/example/.deps/libexample_a-ha_example.Po
+storage/heap/.deps/_check.Po
+storage/heap/.deps/_rectest.Po
+storage/heap/.deps/hp_block.Po
+storage/heap/.deps/hp_clear.Po
+storage/heap/.deps/hp_close.Po
+storage/heap/.deps/hp_create.Po
+storage/heap/.deps/hp_delete.Po
+storage/heap/.deps/hp_extra.Po
+storage/heap/.deps/hp_hash.Po
+storage/heap/.deps/hp_info.Po
+storage/heap/.deps/hp_open.Po
+storage/heap/.deps/hp_panic.Po
+storage/heap/.deps/hp_rename.Po
+storage/heap/.deps/hp_rfirst.Po
+storage/heap/.deps/hp_rkey.Po
+storage/heap/.deps/hp_rlast.Po
+storage/heap/.deps/hp_rnext.Po
+storage/heap/.deps/hp_rprev.Po
+storage/heap/.deps/hp_rrnd.Po
+storage/heap/.deps/hp_rsame.Po
+storage/heap/.deps/hp_scan.Po
+storage/heap/.deps/hp_static.Po
+storage/heap/.deps/hp_test1.Po
+storage/heap/.deps/hp_test2.Po
+storage/heap/.deps/hp_update.Po
+storage/heap/.deps/hp_write.Po
+storage/heap/hp_test1
+storage/heap/hp_test2
+storage/innobase/autom4te-2.53.cache/*
+storage/innobase/autom4te-2.53.cache/output.0
+storage/innobase/autom4te-2.53.cache/requests
+storage/innobase/autom4te-2.53.cache/traces.0
+storage/innobase/autom4te.cache/*
+storage/innobase/autom4te.cache/output.0
+storage/innobase/autom4te.cache/requests
+storage/innobase/autom4te.cache/traces.0
+storage/innobase/btr/.deps/btr0btr.Po
+storage/innobase/btr/.deps/btr0cur.Po
+storage/innobase/btr/.deps/btr0pcur.Po
+storage/innobase/btr/.deps/btr0sea.Po
+storage/innobase/buf/.deps/buf0buf.Po
+storage/innobase/buf/.deps/buf0flu.Po
+storage/innobase/buf/.deps/buf0lru.Po
+storage/innobase/buf/.deps/buf0rea.Po
+storage/innobase/configure.lineno
+storage/innobase/conftest.s1
+storage/innobase/conftest.subs
+storage/innobase/data/.deps/data0data.Po
+storage/innobase/data/.deps/data0type.Po
+storage/innobase/dict/.deps/dict0boot.Po
+storage/innobase/dict/.deps/dict0crea.Po
+storage/innobase/dict/.deps/dict0dict.Po
+storage/innobase/dict/.deps/dict0load.Po
+storage/innobase/dict/.deps/dict0mem.Po
+storage/innobase/dyn/.deps/dyn0dyn.Po
+storage/innobase/eval/.deps/eval0eval.Po
+storage/innobase/eval/.deps/eval0proc.Po
+storage/innobase/fil/.deps/fil0fil.Po
+storage/innobase/fsp/.deps/fsp0fsp.Po
+storage/innobase/fut/.deps/fut0fut.Po
+storage/innobase/fut/.deps/fut0lst.Po
+storage/innobase/ha/.deps/ha0ha.Po
+storage/innobase/ha/.deps/hash0hash.Po
+storage/innobase/ib_config.h
+storage/innobase/ib_config.h.in
+storage/innobase/ibuf/.deps/ibuf0ibuf.Po
+storage/innobase/lock/.deps/lock0lock.Po
+storage/innobase/log/.deps/log0log.Po
+storage/innobase/log/.deps/log0recv.Po
+storage/innobase/mach/.deps/mach0data.Po
+storage/innobase/mem/.deps/mem0mem.Po
+storage/innobase/mem/.deps/mem0pool.Po
+storage/innobase/mkinstalldirs
+storage/innobase/mtr/.deps/mtr0log.Po
+storage/innobase/mtr/.deps/mtr0mtr.Po
+storage/innobase/os/.deps/os0file.Po
+storage/innobase/os/.deps/os0proc.Po
+storage/innobase/os/.deps/os0sync.Po
+storage/innobase/os/.deps/os0thread.Po
+storage/innobase/page/.deps/page0cur.Po
+storage/innobase/page/.deps/page0page.Po
+storage/innobase/pars/.deps/lexyy.Po
+storage/innobase/pars/.deps/pars0grm.Po
+storage/innobase/pars/.deps/pars0opt.Po
+storage/innobase/pars/.deps/pars0pars.Po
+storage/innobase/pars/.deps/pars0sym.Po
+storage/innobase/que/.deps/que0que.Po
+storage/innobase/read/.deps/read0read.Po
+storage/innobase/rem/.deps/rem0cmp.Po
+storage/innobase/rem/.deps/rem0rec.Po
+storage/innobase/row/.deps/row0ins.Po
+storage/innobase/row/.deps/row0mysql.Po
+storage/innobase/row/.deps/row0purge.Po
+storage/innobase/row/.deps/row0row.Po
+storage/innobase/row/.deps/row0sel.Po
+storage/innobase/row/.deps/row0uins.Po
+storage/innobase/row/.deps/row0umod.Po
+storage/innobase/row/.deps/row0undo.Po
+storage/innobase/row/.deps/row0upd.Po
+storage/innobase/row/.deps/row0vers.Po
+storage/innobase/srv/.deps/srv0que.Po
+storage/innobase/srv/.deps/srv0srv.Po
+storage/innobase/srv/.deps/srv0start.Po
+storage/innobase/stamp-h1
+storage/innobase/sync/.deps/sync0arr.Po
+storage/innobase/sync/.deps/sync0rw.Po
+storage/innobase/sync/.deps/sync0sync.Po
+storage/innobase/thr/.deps/thr0loc.Po
+storage/innobase/trx/.deps/trx0purge.Po
+storage/innobase/trx/.deps/trx0rec.Po
+storage/innobase/trx/.deps/trx0roll.Po
+storage/innobase/trx/.deps/trx0rseg.Po
+storage/innobase/trx/.deps/trx0sys.Po
+storage/innobase/trx/.deps/trx0trx.Po
+storage/innobase/trx/.deps/trx0undo.Po
+storage/innobase/usr/.deps/usr0sess.Po
+storage/innobase/ut/.deps/ut0byte.Po
+storage/innobase/ut/.deps/ut0dbg.Po
+storage/innobase/ut/.deps/ut0list.Po
+storage/innobase/ut/.deps/ut0mem.Po
+storage/innobase/ut/.deps/ut0rnd.Po
+storage/innobase/ut/.deps/ut0ut.Po
+storage/innobase/ut/.deps/ut0vec.Po
+storage/innobase/ut/.deps/ut0wqueue.Po
+storage/myisam/.deps/ft_boolean_search.Po
+storage/myisam/.deps/ft_nlq_search.Po
+storage/myisam/.deps/ft_parser.Po
+storage/myisam/.deps/ft_static.Po
+storage/myisam/.deps/ft_stopwords.Po
+storage/myisam/.deps/ft_update.Po
+storage/myisam/.deps/mi_cache.Po
+storage/myisam/.deps/mi_changed.Po
+storage/myisam/.deps/mi_check.Po
+storage/myisam/.deps/mi_checksum.Po
+storage/myisam/.deps/mi_close.Po
+storage/myisam/.deps/mi_create.Po
+storage/myisam/.deps/mi_dbug.Po
+storage/myisam/.deps/mi_delete.Po
+storage/myisam/.deps/mi_delete_all.Po
+storage/myisam/.deps/mi_delete_table.Po
+storage/myisam/.deps/mi_dynrec.Po
+storage/myisam/.deps/mi_extra.Po
+storage/myisam/.deps/mi_info.Po
+storage/myisam/.deps/mi_key.Po
+storage/myisam/.deps/mi_keycache.Po
+storage/myisam/.deps/mi_locking.Po
+storage/myisam/.deps/mi_log.Po
+storage/myisam/.deps/mi_open.Po
+storage/myisam/.deps/mi_packrec.Po
+storage/myisam/.deps/mi_page.Po
+storage/myisam/.deps/mi_panic.Po
+storage/myisam/.deps/mi_preload.Po
+storage/myisam/.deps/mi_range.Po
+storage/myisam/.deps/mi_rename.Po
+storage/myisam/.deps/mi_rfirst.Po
+storage/myisam/.deps/mi_rkey.Po
+storage/myisam/.deps/mi_rlast.Po
+storage/myisam/.deps/mi_rnext.Po
+storage/myisam/.deps/mi_rnext_same.Po
+storage/myisam/.deps/mi_rprev.Po
+storage/myisam/.deps/mi_rrnd.Po
+storage/myisam/.deps/mi_rsame.Po
+storage/myisam/.deps/mi_rsamepos.Po
+storage/myisam/.deps/mi_scan.Po
+storage/myisam/.deps/mi_search.Po
+storage/myisam/.deps/mi_static.Po
+storage/myisam/.deps/mi_statrec.Po
+storage/myisam/.deps/mi_test1.Po
+storage/myisam/.deps/mi_test2.Po
+storage/myisam/.deps/mi_test3.Po
+storage/myisam/.deps/mi_unique.Po
+storage/myisam/.deps/mi_update.Po
+storage/myisam/.deps/mi_write.Po
+storage/myisam/.deps/myisam_ftdump.Po
+storage/myisam/.deps/myisamchk.Po
+storage/myisam/.deps/myisamlog.Po
+storage/myisam/.deps/myisampack.Po
+storage/myisam/.deps/rt_index.Po
+storage/myisam/.deps/rt_key.Po
+storage/myisam/.deps/rt_mbr.Po
+storage/myisam/.deps/rt_split.Po
+storage/myisam/.deps/rt_test.Po
+storage/myisam/.deps/sort.Po
+storage/myisam/.deps/sp_key.Po
+storage/myisam/.deps/sp_test.Po
+storage/myisam/FT1.MYD
+storage/myisam/FT1.MYI
+storage/myisam/ft_dump
+storage/myisam/ft_eval
+storage/myisam/ft_test1
+storage/myisam/ftbench/data
+storage/myisam/ftbench/t
+storage/myisam/ftbench/var/*
+storage/myisam/mi_test1
+storage/myisam/mi_test2
+storage/myisam/mi_test3
+storage/myisam/mi_test_all
+storage/myisam/myisam.log
+storage/myisam/myisam_ftdump
+storage/myisam/myisamchk
+storage/myisam/myisamlog
+storage/myisam/myisampack
+storage/myisam/rt_test
+storage/myisam/rt_test.MYD
+storage/myisam/rt_test.MYI
+storage/myisam/sp_test
+storage/myisam/test1.MYD
+storage/myisam/test1.MYI
+storage/myisam/test2.MYD
+storage/myisam/test2.MYI
+storage/myisammrg/.deps/myrg_close.Po
+storage/myisammrg/.deps/myrg_create.Po
+storage/myisammrg/.deps/myrg_delete.Po
+storage/myisammrg/.deps/myrg_extra.Po
+storage/myisammrg/.deps/myrg_info.Po
+storage/myisammrg/.deps/myrg_locking.Po
+storage/myisammrg/.deps/myrg_open.Po
+storage/myisammrg/.deps/myrg_panic.Po
+storage/myisammrg/.deps/myrg_queue.Po
+storage/myisammrg/.deps/myrg_range.Po
+storage/myisammrg/.deps/myrg_rfirst.Po
+storage/myisammrg/.deps/myrg_rkey.Po
+storage/myisammrg/.deps/myrg_rlast.Po
+storage/myisammrg/.deps/myrg_rnext.Po
+storage/myisammrg/.deps/myrg_rnext_same.Po
+storage/myisammrg/.deps/myrg_rprev.Po
+storage/myisammrg/.deps/myrg_rrnd.Po
+storage/myisammrg/.deps/myrg_rsame.Po
+storage/myisammrg/.deps/myrg_static.Po
+storage/myisammrg/.deps/myrg_update.Po
+storage/myisammrg/.deps/myrg_write.Po
+storage/ndb/bin/DbAsyncGenerator
+storage/ndb/bin/DbCreate
+storage/ndb/bin/acid
+storage/ndb/bin/async-lmc-bench-l-p10.sh
+storage/ndb/bin/async-lmc-bench-l.sh
+storage/ndb/bin/async-lmc-bench-p10.sh
+storage/ndb/bin/async-lmc-bench.sh
+storage/ndb/bin/atrt
+storage/ndb/bin/atrt-analyze-result.sh
+storage/ndb/bin/atrt-clear-result.sh
+storage/ndb/bin/atrt-gather-result.sh
+storage/ndb/bin/atrt-setup.sh
+storage/ndb/bin/bankCreator
+storage/ndb/bin/bankMakeGL
+storage/ndb/bin/bankSumAccounts
+storage/ndb/bin/bankTimer
+storage/ndb/bin/bankTransactionMaker
+storage/ndb/bin/bankValidateAllGLs
+storage/ndb/bin/basicTransporterTest
+storage/ndb/bin/benchronja
+storage/ndb/bin/bulk_copy
+storage/ndb/bin/copy_tab
+storage/ndb/bin/create_all_tabs
+storage/ndb/bin/create_index
+storage/ndb/bin/create_tab
+storage/ndb/bin/delete_all
+storage/ndb/bin/desc
+storage/ndb/bin/drop_all_tabs
+storage/ndb/bin/drop_index
+storage/ndb/bin/drop_tab
+storage/ndb/bin/flexAsynch
+storage/ndb/bin/flexBench
+storage/ndb/bin/flexHammer
+storage/ndb/bin/flexScan
+storage/ndb/bin/flexTT
+storage/ndb/bin/hugoCalculator
+storage/ndb/bin/hugoFill
+storage/ndb/bin/hugoLoad
+storage/ndb/bin/hugoLockRecords
+storage/ndb/bin/hugoPkDelete
+storage/ndb/bin/hugoPkRead
+storage/ndb/bin/hugoPkReadRecord
+storage/ndb/bin/hugoPkUpdate
+storage/ndb/bin/hugoScanRead
+storage/ndb/bin/hugoScanUpdate
+storage/ndb/bin/index
+storage/ndb/bin/index2
+storage/ndb/bin/initronja
+storage/ndb/bin/interpreterInTup
+storage/ndb/bin/list_tables
+storage/ndb/bin/make-config.sh
+storage/ndb/bin/mgmtclient
+storage/ndb/bin/mgmtsrvr
+storage/ndb/bin/mkconfig
+storage/ndb/bin/ndb
+storage/ndb/bin/ndb_cpcc
+storage/ndb/bin/ndb_cpcd
+storage/ndb/bin/ndb_rep
+storage/ndb/bin/ndbsql
+storage/ndb/bin/newton_basic
+storage/ndb/bin/newton_br
+storage/ndb/bin/newton_pb
+storage/ndb/bin/newton_perf
+storage/ndb/bin/perfTransporterTest
+storage/ndb/bin/printConfig
+storage/ndb/bin/printSchemafile
+storage/ndb/bin/printSysfile
+storage/ndb/bin/redoLogFileReader
+storage/ndb/bin/restart
+storage/ndb/bin/restarter
+storage/ndb/bin/restarter2
+storage/ndb/bin/restarts
+storage/ndb/bin/restore
+storage/ndb/bin/select_all
+storage/ndb/bin/select_count
+storage/ndb/bin/telco
+storage/ndb/bin/testBackup
+storage/ndb/bin/testBank
+storage/ndb/bin/testBasic
+storage/ndb/bin/testBasicAsynch
+storage/ndb/bin/testCopy
+storage/ndb/bin/testDataBuffers
+storage/ndb/bin/testDict
+storage/ndb/bin/testGrep
+storage/ndb/bin/testGrepVerify
+storage/ndb/bin/testIndex
+storage/ndb/bin/testInterpreter
+storage/ndb/bin/testKernelDataBuffer
+storage/ndb/bin/testLongSig
+storage/ndb/bin/testMgm
+storage/ndb/bin/testMgmapi
+storage/ndb/bin/testNdbApi
+storage/ndb/bin/testNodeRestart
+storage/ndb/bin/testOIBasic
+storage/ndb/bin/testOdbcDriver
+storage/ndb/bin/testOperations
+storage/ndb/bin/testRestartGci
+storage/ndb/bin/testScan
+storage/ndb/bin/testScanInterpreter
+storage/ndb/bin/testSimplePropertiesSection
+storage/ndb/bin/testSystemRestart
+storage/ndb/bin/testTimeout
+storage/ndb/bin/testTransactions
+storage/ndb/bin/test_cpcd
+storage/ndb/bin/test_event
+storage/ndb/bin/verify_index
+storage/ndb/bin/waiter
+storage/ndb/config/autom4te.cache/*
+storage/ndb/config/config.mk
+storage/ndb/examples/ndbapi_example1/ndbapi_example1
+storage/ndb/examples/ndbapi_example2/ndbapi_example2
+storage/ndb/examples/ndbapi_example3/ndbapi_example3
+storage/ndb/examples/ndbapi_example5/ndbapi_example5
+storage/ndb/examples/select_all/select_all
+storage/ndb/include/ndb_global.h
+storage/ndb/include/ndb_types.h
+storage/ndb/include/ndb_version.h
+storage/ndb/lib/libMGM_API.so
+storage/ndb/lib/libNDB_API.so
+storage/ndb/lib/libNDB_ODBC.so
+storage/ndb/lib/libNEWTON_API.so
+storage/ndb/lib/libNEWTON_BASICTEST_COMMON.so
+storage/ndb/lib/libREP_API.so
+storage/ndb/lib/libndbclient.so
+storage/ndb/lib/libndbclient_extra.so
+storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent
+storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2
+storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async
+storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1
+storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event
+storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries
+storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan
+storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple
+storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual
+storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index
+storage/ndb/src/common/debugger/libtrace.dsp
+storage/ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
+storage/ndb/src/common/logger/liblogger.dsp
+storage/ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
+storage/ndb/src/common/mgmcommon/printConfig/*.d
+storage/ndb/src/common/portlib/libportlib.dsp
+storage/ndb/src/common/transporter/libtransporter.dsp
+storage/ndb/src/common/util/libgeneral.dsp
+storage/ndb/src/common/util/testBitmask.cpp
+storage/ndb/src/cw/cpcd/ndb_cpcd
+storage/ndb/src/dummy.cpp
+storage/ndb/src/kernel/blocks/backup/libbackup.dsp
+storage/ndb/src/kernel/blocks/backup/ndb_print_backup_file
+storage/ndb/src/kernel/blocks/backup/restore/ndb_restore
+storage/ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
+storage/ndb/src/kernel/blocks/dbacc/libdbacc.dsp
+storage/ndb/src/kernel/blocks/dbdict/libdbdict.dsp
+storage/ndb/src/kernel/blocks/dbdict/ndb_print_schema_file
+storage/ndb/src/kernel/blocks/dbdih/libdbdih.dsp
+storage/ndb/src/kernel/blocks/dbdih/ndb_print_sys_file
+storage/ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+storage/ndb/src/kernel/blocks/dbtc/libdbtc.dsp
+storage/ndb/src/kernel/blocks/dbtup/libdbtup.dsp
+storage/ndb/src/kernel/blocks/dbtup/test_varpage
+storage/ndb/src/kernel/blocks/dbtux/libdbtux.dsp
+storage/ndb/src/kernel/blocks/dbutil/libdbutil.dsp
+storage/ndb/src/kernel/blocks/grep/libgrep.dsp
+storage/ndb/src/kernel/blocks/ndb_print_file
+storage/ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
+storage/ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
+storage/ndb/src/kernel/blocks/qmgr/libqmgr.dsp
+storage/ndb/src/kernel/blocks/suma/libsuma.dsp
+storage/ndb/src/kernel/blocks/trix/libtrix.dsp
+storage/ndb/src/kernel/error/liberror.dsp
+storage/ndb/src/kernel/ndbd
+storage/ndb/src/kernel/ndbd.dsp
+storage/ndb/src/kernel/vm/libkernel.dsp
+storage/ndb/src/libndb.ver
+storage/ndb/src/libndbclient.dsp
+storage/ndb/src/mgmapi/libmgmapi.dsp
+storage/ndb/src/mgmclient/libndbmgmclient.dsp
+storage/ndb/src/mgmclient/ndb_mgm
+storage/ndb/src/mgmclient/ndb_mgm.dsp
+storage/ndb/src/mgmclient/test_cpcd/*.d
+storage/ndb/src/mgmsrv/ndb_mgmd
+storage/ndb/src/mgmsrv/ndb_mgmd.dsp
+storage/ndb/src/ndbapi/libndbapi.dsp
+storage/ndb/src/ndbapi/ndberror_check
+storage/ndb/test/ndbapi/DbAsyncGenerator
+storage/ndb/test/ndbapi/DbCreate
+storage/ndb/test/ndbapi/bank/bankCreator
+storage/ndb/test/ndbapi/bank/bankMakeGL
+storage/ndb/test/ndbapi/bank/bankSumAccounts
+storage/ndb/test/ndbapi/bank/bankTimer
+storage/ndb/test/ndbapi/bank/bankTransactionMaker
+storage/ndb/test/ndbapi/bank/bankValidateAllGLs
+storage/ndb/test/ndbapi/bank/testBank
+storage/ndb/test/ndbapi/create_all_tabs
+storage/ndb/test/ndbapi/create_tab
+storage/ndb/test/ndbapi/drop_all_tabs
+storage/ndb/test/ndbapi/flexAsynch
+storage/ndb/test/ndbapi/flexBench
+storage/ndb/test/ndbapi/flexBench.dsp
+storage/ndb/test/ndbapi/flexHammer
+storage/ndb/test/ndbapi/flexTT
+storage/ndb/test/ndbapi/ndbapi_slow_select
+storage/ndb/test/ndbapi/testBackup
+storage/ndb/test/ndbapi/testBasic
+storage/ndb/test/ndbapi/testBasic.dsp
+storage/ndb/test/ndbapi/testBasicAsynch
+storage/ndb/test/ndbapi/testBitfield
+storage/ndb/test/ndbapi/testBlobs
+storage/ndb/test/ndbapi/testBlobs.dsp
+storage/ndb/test/ndbapi/testDataBuffers
+storage/ndb/test/ndbapi/testDeadlock
+storage/ndb/test/ndbapi/testDict
+storage/ndb/test/ndbapi/testIndex
+storage/ndb/test/ndbapi/testIndexStat
+storage/ndb/test/ndbapi/testInterpreter
+storage/ndb/test/ndbapi/testLcp
+storage/ndb/test/ndbapi/testMgm
+storage/ndb/test/ndbapi/testNdbApi
+storage/ndb/test/ndbapi/testNodeRestart
+storage/ndb/test/ndbapi/testOIBasic
+storage/ndb/test/ndbapi/testOperations
+storage/ndb/test/ndbapi/testPartitioning
+storage/ndb/test/ndbapi/testReadPerf
+storage/ndb/test/ndbapi/testRestartGci
+storage/ndb/test/ndbapi/testSRBank
+storage/ndb/test/ndbapi/testScan
+storage/ndb/test/ndbapi/testScan.dsp
+storage/ndb/test/ndbapi/testScanInterpreter
+storage/ndb/test/ndbapi/testScanPerf
+storage/ndb/test/ndbapi/testSystemRestart
+storage/ndb/test/ndbapi/testTimeout
+storage/ndb/test/ndbapi/testTransactions
+storage/ndb/test/ndbapi/test_event
+storage/ndb/test/ndbapi/test_event_merge
+storage/ndb/test/run-test/atrt
+storage/ndb/test/src/libNDBT.dsp
+storage/ndb/test/tools/copy_tab
+storage/ndb/test/tools/create_index
+storage/ndb/test/tools/hugoCalculator
+storage/ndb/test/tools/hugoFill
+storage/ndb/test/tools/hugoLoad
+storage/ndb/test/tools/hugoLockRecords
+storage/ndb/test/tools/hugoPkDelete
+storage/ndb/test/tools/hugoPkRead
+storage/ndb/test/tools/hugoPkReadRecord
+storage/ndb/test/tools/hugoPkUpdate
+storage/ndb/test/tools/hugoScanRead
+storage/ndb/test/tools/hugoScanUpdate
+storage/ndb/test/tools/listen_event
+storage/ndb/test/tools/ndb_cpcc
+storage/ndb/test/tools/rep_latency
+storage/ndb/test/tools/restart
+storage/ndb/test/tools/verify_index
+storage/ndb/tools/ndb_config
+storage/ndb/tools/ndb_delete_all
+storage/ndb/tools/ndb_delete_all.dsp
+storage/ndb/tools/ndb_desc
+storage/ndb/tools/ndb_desc.dsp
+storage/ndb/tools/ndb_drop_index
+storage/ndb/tools/ndb_drop_index.dsp
+storage/ndb/tools/ndb_drop_table
+storage/ndb/tools/ndb_drop_table.dsp
+storage/ndb/tools/ndb_restore
+storage/ndb/tools/ndb_select_all
+storage/ndb/tools/ndb_select_all.dsp
+storage/ndb/tools/ndb_select_count
+storage/ndb/tools/ndb_select_count.dsp
+storage/ndb/tools/ndb_show_tables
+storage/ndb/tools/ndb_show_tables.dsp
+storage/ndb/tools/ndb_test_platform
+storage/ndb/tools/ndb_waiter
+storage/ndb/tools/ndb_waiter.dsp
+strings/*.ds?
+strings/*.vcproj
+strings/.deps/bchange.Po
+strings/.deps/bcmp.Po
+strings/.deps/bfill.Po
+strings/.deps/bmove.Po
+strings/.deps/bmove512.Po
+strings/.deps/bmove_upp.Po
+strings/.deps/conf_to_src.Po
+strings/.deps/ctype-big5.Po
+strings/.deps/ctype-bin.Po
+strings/.deps/ctype-cp932.Po
+strings/.deps/ctype-czech.Po
+strings/.deps/ctype-euc_kr.Po
+strings/.deps/ctype-eucjpms.Po
+strings/.deps/ctype-extra.Po
+strings/.deps/ctype-gb2312.Po
+strings/.deps/ctype-gbk.Po
+strings/.deps/ctype-latin1.Po
+strings/.deps/ctype-mb.Po
+strings/.deps/ctype-simple.Po
+strings/.deps/ctype-sjis.Po
+strings/.deps/ctype-tis620.Po
+strings/.deps/ctype-uca.Po
+strings/.deps/ctype-ucs2.Po
+strings/.deps/ctype-ujis.Po
+strings/.deps/ctype-utf8.Po
+strings/.deps/ctype-win1250ch.Po
+strings/.deps/ctype.Po
+strings/.deps/decimal.Po
+strings/.deps/int2str.Po
+strings/.deps/is_prefix.Po
+strings/.deps/llstr.Po
+strings/.deps/longlong2str.Po
+strings/.deps/longlong2str_asm.Po
+strings/.deps/my_strchr.Po
+strings/.deps/my_strtoll10.Po
+strings/.deps/my_vsnprintf.Po
+strings/.deps/r_strinstr.Po
+strings/.deps/str2int.Po
+strings/.deps/str_alloc.Po
+strings/.deps/strappend.Po
+strings/.deps/strcend.Po
+strings/.deps/strcont.Po
+strings/.deps/strend.Po
+strings/.deps/strfill.Po
+strings/.deps/strinstr.Po
+strings/.deps/strmake.Po
+strings/.deps/strmov.Po
+strings/.deps/strnlen.Po
+strings/.deps/strnmov.Po
+strings/.deps/strstr.Po
+strings/.deps/strtod.Po
+strings/.deps/strtol.Po
+strings/.deps/strtoll.Po
+strings/.deps/strtoul.Po
+strings/.deps/strtoull.Po
+strings/.deps/strxmov.Po
+strings/.deps/strxnmov.Po
+strings/.deps/xml.Po
+strings/conf_to_src
+strings/ctype_autoconf.c
+strings/ctype_extra_sources.c
+strings/str_test
+strings/test_decimal
+support-files/*.ini
+support-files/MacOSX/Description.plist
+support-files/MacOSX/Info.plist
+support-files/MacOSX/ReadMe.txt
+support-files/MacOSX/StartupParameters.plist
+support-files/MacOSX/postflight
+support-files/MacOSX/postinstall
+support-files/MacOSX/preflight
+support-files/MacOSX/preinstall
+support-files/binary-configure
+support-files/my-huge.cnf
+support-files/my-innodb-heavy-4G.cnf
+support-files/my-large.cnf
+support-files/my-medium.cnf
+support-files/my-small.cnf
+support-files/mysql-3.23.25-beta.spec
+support-files/mysql-3.23.26-beta.spec
+support-files/mysql-3.23.27-beta.spec
+support-files/mysql-3.23.28-gamma.spec
+support-files/mysql-3.23.29-gamma.spec
+support-files/mysql-log-rotate
+support-files/mysql.server
+support-files/mysql.spec
+support-files/mysqld_multi.server
+support-files/ndb-config-2-node.ini
+tags
+test/ndbapi/bank/bankCreator
+test/ndbapi/bank/bankMakeGL
+test/ndbapi/bank/bankSumAccounts
+test/ndbapi/bank/bankTimer
+test/ndbapi/bank/bankTransactionMaker
+test/ndbapi/bank/bankValidateAllGLs
+test/ndbapi/bank/testBank
+test/ndbapi/create_all_tabs
+test/ndbapi/create_tab
+test/ndbapi/drop_all_tabs
+test/ndbapi/flexAsynch
+test/ndbapi/flexBench
+test/ndbapi/flexHammer
+test/ndbapi/flexTT
+test/ndbapi/testBackup
+test/ndbapi/testBasic
+test/ndbapi/testBasicAsynch
+test/ndbapi/testBlobs
+test/ndbapi/testDataBuffers
+test/ndbapi/testDeadlock
+test/ndbapi/testDict
+test/ndbapi/testIndex
+test/ndbapi/testMgm
+test/ndbapi/testNdbApi
+test/ndbapi/testNodeRestart
+test/ndbapi/testOIBasic
+test/ndbapi/testOperations
+test/ndbapi/testRestartGci
+test/ndbapi/testScan
+test/ndbapi/testScanInterpreter
+test/ndbapi/testScanPerf
+test/ndbapi/testSystemRestart
+test/ndbapi/testTimeout
+test/ndbapi/testTransactions
+test/ndbapi/test_event
+test/run-test/atrt
+test/tools/copy_tab
+test/tools/create_index
+test/tools/hugoCalculator
+test/tools/hugoFill
+test/tools/hugoLoad
+test/tools/hugoLockRecords
+test/tools/hugoPkDelete
+test/tools/hugoPkRead
+test/tools/hugoPkReadRecord
+test/tools/hugoPkUpdate
+test/tools/hugoScanRead
+test/tools/hugoScanUpdate
+test/tools/ndb_cpcc
+test/tools/restart
+test/tools/verify_index
+test1/*
+test_xml
+tests/*.ds?
+tests/*.vcproj
+tests/.deps/dummy.Po
+tests/.deps/insert_test.Po
+tests/.deps/mysql_client_test.Po
+tests/.deps/select_test.Po
+tests/.deps/thread_test.Po
+tests/.libs -prune
+tests/.libs/lt-mysql_client_test
+tests/.libs/mysql_client_test
+tests/bug25714
+tests/client_test
+tests/connect_test
+tests/mysql_client_test
+thr_insert_test/*
+thr_test/*
+thread_test
+tmp/*
+tools/.libs -prune
+tools/my_vsnprintf.c
+tools/mysqlmanager
+tools/mysqlmngd
+tools/mysqltestmanager
+tools/mysys_priv.h
+unittest/examples/*.t
+unittest/examples/.deps/no_plan-t.Po
+unittest/examples/.deps/simple-t.Po
+unittest/examples/.deps/skip-t.Po
+unittest/examples/.deps/skip_all-t.Po
+unittest/examples/.deps/todo-t.Po
+unittest/mysys/*.t
+unittest/mysys/.deps/base64-t.Po
+unittest/mysys/.deps/bitmap-t.Po
+unittest/mysys/.deps/my_atomic-t.Po
+unittest/mytap/.deps/tap.Po
+unittest/mytap/t/*.t
+unittest/mytap/t/.deps/basic-t.Po
+unittest/unit
+vi.h
+vio/*.ds?
+vio/*.vcproj
+vio/.deps/dummy.Po
+vio/.deps/test-ssl.Po
+vio/.deps/test-sslclient.Po
+vio/.deps/test-sslserver.Po
+vio/.deps/vio.Po
+vio/.deps/viosocket.Po
+vio/.deps/viossl.Po
+vio/.deps/viosslfactories.Po
+vio/test-ssl
+vio/test-sslclient
+vio/test-sslserver
+vio/viotest-ssl
+vio/viotest-sslconnect.cpp
+vio/viotest.cpp
+win/configure.data
+win/vs71cache.txt
+win/vs8cache.txt
+win/nmake_cache.txt
+ylwrap
+zlib/*.ds?
+zlib/*.vcproj
+mysql-test/bug36522-64.tar
+mysql-test/bug36522.tar
+mysql-test/t.log
+mysql-test/tps.log
+libmysqld/event_parse_data.cc
+autom4te.cache
+sql/share/czech
+sql/share/danish
+sql/share/dutch
+sql/share/english
+sql/share/estonian
+sql/share/french
+sql/share/german
+sql/share/greek
+sql/share/hungarian
+sql/share/italian
+sql/share/japanese
+sql/share/japanese-sjis
+sql/share/korean
+sql/share/norwegian
+sql/share/norwegian-ny
+sql/share/polish
+sql/share/portuguese
+sql/share/romanian
+sql/share/russian
+sql/share/serbian
+sql/share/slovak
+sql/share/spanish
+sql/share/swedish
+sql/share/ukrainian
+libmysqld/examples/mysqltest.cc
+libmysqld/sql_signal.cc
+libmysqld/debug_sync.cc
+dbug/tests
+libmysqld/mdl.cc
+client/transaction.h
+libmysqld/transaction.cc
+libmysqld/sys_vars.cc
+libmysqld/keycaches.cc
+client/dtoa.c
+libmysqld/sql_audit.cc
+configure.am
+libmysqld/des_key_file.cc
+CPackConfig.cmake
+CPackSourceConfig.cmake
+make_dist.cmake
+client/echo
+libmysql/libmysql_exports_file.cc
+libmysql/merge_archives_mysqlclient.cmake
+libmysqld/merge_archives_mysqlserver.cmake
+libmysqld/mysqlserver_depends.c
+libmysqld/examples/mysql_embedded
+sql/dummy.bak
+mysys/thr_lock
+VERSION.dep
+info_macros.cmake
+Docs/INFO_BIN
+Docs/INFO_SRC
+Testing
+FilesCopied
+source_downloads
diff -pruN 5.5.40-1/include/my_pthread.h 5.5.42-1/include/my_pthread.h
--- 5.5.40-1/include/my_pthread.h	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/include/my_pthread.h	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -142,8 +142,18 @@ int pthread_attr_init(pthread_attr_t *co
 int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
 int pthread_attr_destroy(pthread_attr_t *connect_att);
 int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(void));
-struct tm *localtime_r(const time_t *timep,struct tm *tmp);
-struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
+
+static inline struct tm *localtime_r(const time_t *timep, struct tm *tmp)
+{
+  localtime_s(tmp, timep);
+  return tmp;
+}
+
+static inline struct tm *gmtime_r(const time_t *clock, struct tm *res)
+{
+  gmtime_s(res, clock);
+  return res;
+}
 
 void pthread_exit(void *a);
 int pthread_join(pthread_t thread, void **value_ptr);
diff -pruN 5.5.40-1/include/welcome_copyright_notice.h 5.5.42-1/include/welcome_copyright_notice.h
--- 5.5.40-1/include/welcome_copyright_notice.h	2014-09-08 09:53:17.000000000 +0000
+++ 5.5.42-1/include/welcome_copyright_notice.h	2015-01-06 20:39:40.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -16,7 +16,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2015"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
diff -pruN 5.5.40-1/INSTALL-SOURCE 5.5.42-1/INSTALL-SOURCE
--- 5.5.40-1/INSTALL-SOURCE	2014-09-08 09:53:25.000000000 +0000
+++ 5.5.42-1/INSTALL-SOURCE	2015-01-06 20:39:51.000000000 +0000
@@ -1,305 +1,224 @@
-
 Chapter 2 Installing and Upgrading MySQL
 
-   This chapter describes how to obtain and install MySQL. A summary
-   of the procedure follows and later sections provide the details.
-   If you plan to upgrade an existing version of MySQL to a newer
-   version rather than install MySQL for the first time, see Section
-   2.11.1, "Upgrading MySQL," for information about upgrade
-   procedures and about issues that you should consider before
-   upgrading.
-
-   If you are interested in migrating to MySQL from another database
-   system, you may wish to read Section A.8, "MySQL 5.5 FAQ:
-   Migration," which contains answers to some common questions
-   concerning migration issues.
+   This chapter describes how to obtain and install MySQL. A
+   summary of the procedure follows and later sections provide
+   the details. If you plan to upgrade an existing version of
+   MySQL to a newer version rather than install MySQL for the
+   first time, see Section 2.11.1, "Upgrading MySQL," for
+   information about upgrade procedures and about issues that
+   you should consider before upgrading.
+
+   If you are interested in migrating to MySQL from another
+   database system, you may wish to read Section A.8, "MySQL 5.5
+   FAQ: Migration," which contains answers to some common
+   questions concerning migration issues.
 
    If you are migrating from MySQL Enterprise Edition to MySQL
-   Community Server, see Section 2.11.2.2, "Downgrading from MySQL
-   Enterprise Edition to MySQL Community Server."
+   Community Server, see Section 2.11.2.2, "Downgrading from
+   MySQL Enterprise Edition to MySQL Community Server."
 
-   Installation of MySQL generally follows the steps outlined here:
+   Installation of MySQL generally follows the steps outlined
+   here:
 
     1. Determine whether MySQL runs and is supported on your
        platform.
-       Please note that not all platforms are equally suitable for
-       running MySQL, and that not all platforms on which MySQL is
-       known to run are officially supported by Oracle Corporation:
+       Please note that not all platforms are equally suitable
+       for running MySQL, and that not all platforms on which
+       MySQL is known to run are officially supported by Oracle
+       Corporation:
 
     2. Choose which distribution to install.
        Several versions of MySQL are available, and most are
-       available in several distribution formats. You can choose from
-       pre-packaged distributions containing binary (precompiled)
-       programs or source code. When in doubt, use a binary
-       distribution. We also provide public access to our current
-       source tree for those who want to see our most recent
-       developments and help us test new code. To determine which
-       version and type of distribution you should use, see Section
-       2.1.2, "Choosing Which MySQL Distribution to Install."
+       available in several distribution formats. You can choose
+       from pre-packaged distributions containing binary
+       (precompiled) programs or source code. When in doubt, use
+       a binary distribution. We also provide public access to
+       our current source tree for those who want to see our
+       most recent developments and help us test new code. To
+       determine which version and type of distribution you
+       should use, see Section 2.1.2, "Which MySQL Version and
+       Distribution to Install."
 
     3. Download the distribution that you want to install.
-       For instructions, see Section 2.1.3, "How to Get MySQL." To
-       verify the integrity of the distribution, use the instructions
-       in Section 2.1.4, "Verifying Package Integrity Using MD5
-       Checksums or GnuPG."
+       For instructions, see Section 2.1.3, "How to Get MySQL."
+       To verify the integrity of the distribution, use the
+       instructions in Section 2.1.4, "Verifying Package
+       Integrity Using MD5 Checksums or GnuPG."
 
     4. Install the distribution.
        To install MySQL from a binary distribution, use the
-       instructions in Section 2.2, "Installing MySQL on Unix/Linux
-       Using Generic Binaries."
+       instructions in Section 2.2, "Installing MySQL on
+       Unix/Linux Using Generic Binaries."
        To install MySQL from a source distribution or from the
        current development source tree, use the instructions in
        Section 2.9, "Installing MySQL from Source."
 
     5. Perform any necessary postinstallation setup.
-       After installing MySQL, see Section 2.10, "Postinstallation
-       Setup and Testing" for information about making sure the MySQL
-       server is working properly. Also refer to the information
-       provided in Section 2.10.2, "Securing the Initial MySQL
-       Accounts." This section describes how to secure the initial
-       MySQL user accounts, which have no passwords until you assign
-       passwords. The section applies whether you install MySQL using
-       a binary or source distribution.
-
-    6. If you want to run the MySQL benchmark scripts, Perl support
-       for MySQL must be available. See Section 2.13, "Perl
-       Installation Notes."
+       After installing MySQL, see Section 2.10,
+       "Postinstallation Setup and Testing" for information
+       about making sure the MySQL server is working properly.
+       Also refer to the information provided in Section 2.10.2,
+       "Securing the Initial MySQL Accounts." This section
+       describes how to secure the initial MySQL user accounts,
+       which have no passwords until you assign passwords. The
+       section applies whether you install MySQL using a binary
+       or source distribution.
+
+    6. If you want to run the MySQL benchmark scripts, Perl
+       support for MySQL must be available. See Section 2.13,
+       "Perl Installation Notes."
 
    Instructions for installing MySQL on different platforms and
    environments is available on a platform by platform basis:
 
      * Unix, Linux, FreeBSD
-       For instructions on installing MySQL on most Linux and Unix
-       platforms using a generic binary (for example, a .tar.gz
-       package), see Section 2.2, "Installing MySQL on Unix/Linux
-       Using Generic Binaries."
-       For information on building MySQL entirely from the source
-       code distributions or the source code repositories, see
-       Section 2.9, "Installing MySQL from Source"
-       For specific platform help on installation, configuration, and
-       building from source see the corresponding platform section:
-
-          + Linux, including notes on distribution specific methods,
-            see Section 2.5, "Installing MySQL on Linux."
-
-          + Solaris and OpenSolaris, including PKG and IPS formats,
-            see Section 2.7, "Installing MySQL on Solaris and
-            OpenSolaris."
+       For instructions on installing MySQL on most Linux and
+       Unix platforms using a generic binary (for example, a
+       .tar.gz package), see Section 2.2, "Installing MySQL on
+       Unix/Linux Using Generic Binaries."
+       For information on building MySQL entirely from the
+       source code distributions or the source code
+       repositories, see Section 2.9, "Installing MySQL from
+       Source"
+       For specific platform help on installation,
+       configuration, and building from source see the
+       corresponding platform section:
+
+          + Linux, including notes on distribution specific
+            methods, see Section 2.5, "Installing MySQL on
+            Linux."
+
+          + Solaris and OpenSolaris, including PKG and IPS
+            formats, see Section 2.7, "Installing MySQL on
+            Solaris and OpenSolaris."
 
-          + IBM AIX, see Section 2.7, "Installing MySQL on Solaris
-            and OpenSolaris."
+          + IBM AIX, see Section 2.7, "Installing MySQL on
+            Solaris and OpenSolaris."
 
-          + FreeBSD, see Section 2.8, "Installing MySQL on FreeBSD."
+          + FreeBSD, see Section 2.8, "Installing MySQL on
+            FreeBSD."
 
      * Microsoft Windows
-       For instructions on installing MySQL on Microsoft Windows,
-       using either a Zipped binary or an MSI package, see Section
-       2.3, "Installing MySQL on Microsoft Windows."
+       For instructions on installing MySQL on Microsoft
+       Windows, using either a Zipped binary or an MSI package,
+       see Section 2.3, "Installing MySQL on Microsoft Windows."
        For information on using the MySQL Server Instance Config
        Wizard, see Section 2.3.6, "MySQL Server Instance
        Configuration Wizard."
-       For details and instructions on building MySQL from source
-       code using Microsoft Visual Studio, see Section 2.9,
-       "Installing MySQL from Source."
+       For details and instructions on building MySQL from
+       source code using Microsoft Visual Studio, see Section
+       2.9, "Installing MySQL from Source."
 
      * Mac OS X
-       For installation on Mac OS X, including using both the binary
-       package and native PKG formats, see Section 2.4, "Installing
-       MySQL on Mac OS X."
-       For information on making use of the MySQL Startup Item to
-       automatically start and stop MySQL, see Section 2.4.3,
+       For installation on Mac OS X, including using both the
+       binary package and native PKG formats, see Section 2.4,
+       "Installing MySQL on Mac OS X."
+       For information on making use of the MySQL Startup Item
+       to automatically start and stop MySQL, see Section 2.4.4,
        "Installing the MySQL Startup Item."
        For information on the MySQL Preference Pane, see Section
-       2.4.4, "Installing and Using the MySQL Preference Pane."
+       2.4.5, "Installing and Using the MySQL Preference Pane."
 
 2.1 General Installation Guidance
 
    The immediately following sections contain the information
-   necessary to choose, download, and verify your distribution. The
-   instructions in later sections of the chapter describe how to
-   install the distribution that you choose. For binary
-   distributions, see the instructions at Section 2.2, "Installing
-   MySQL on Unix/Linux Using Generic Binaries" or the corresponding
-   section for your platform if available. To build MySQL from
-   source, use the instructions in Section 2.9, "Installing MySQL
-   from Source."
+   necessary to choose, download, and verify your distribution.
+   The instructions in later sections of the chapter describe
+   how to install the distribution that you choose. For binary
+   distributions, see the instructions at Section 2.2,
+   "Installing MySQL on Unix/Linux Using Generic Binaries" or
+   the corresponding section for your platform if available. To
+   build MySQL from source, use the instructions in Section 2.9,
+   "Installing MySQL from Source."
 
 2.1.1 Operating Systems Supported by MySQL Community Server
 
-   MySQL is available on a number of operating systems and platforms.
-   For information about those platforms that are officially
-   supported, see
-   http://www.mysql.com/support/supportedplatforms/database.html on
-   the MySQL Web site.
-
-2.1.2 Choosing Which MySQL Distribution to Install
-
-   When preparing to install MySQL, you should decide which version
-   to use. MySQL development occurs in several release series, and
-   you can pick the one that best fits your needs. After deciding
-   which version to install, you can choose a distribution format.
-   Releases are available in binary or source format.
-
-2.1.2.1 Choosing Which Version of MySQL to Install
-
-   The first decision to make is whether you want to use a production
-   (stable) release or a development release. In the MySQL
-   development process, multiple release series co-exist, each at a
-   different stage of maturity.
-
-Production Releases
-
-
-     * MySQL 5.6: Latest General Availability (Production) release
-
-     * MySQL 5.5: Previous General Availability (Production) release
-
-     * MySQL 5.1: Older General Availability (Production) release
-
-     * MySQL 5.0: Older Production release nearing the end of the
-       product lifecycle
-
-   MySQL 4.1, 4.0, and 3.23 are old releases that are no longer
-   supported.
-
-   See http://www.mysql.com/about/legal/lifecycle/ for information
-   about support policies and schedules.
-
-   Normally, if you are beginning to use MySQL for the first time or
-   trying to port it to some system for which there is no binary
-   distribution, use the most recent General Availability series
-   listed in the preceding descriptions. All MySQL releases, even
-   those from development series, are checked with the MySQL
-   benchmarks and an extensive test suite before being issued.
-
-   If you are running an older system and want to upgrade, but do not
-   want to take the chance of having a nonseamless upgrade, you
-   should upgrade to the latest version in the same release series
-   you are using (where only the last part of the version number is
-   newer than yours). We have tried to fix only fatal bugs and make
-   only small, relatively "safe" changes to that version.
-
-   If you want to use new features not present in the production
-   release series, you can use a version from a development series.
-   Be aware that development releases are not as stable as production
-   releases.
-
-   We do not use a complete code freeze because this prevents us from
-   making bugfixes and other fixes that must be done. We may add
-   small things that should not affect anything that currently works
-   in a production release. Naturally, relevant bugfixes from an
-   earlier series propagate to later series.
-
-   If you want to use the very latest sources containing all current
-   patches and bugfixes, you can use one of our source code
-   repositories (see Section 2.9.3, "Installing MySQL Using a
-   Development Source Tree"). These are not "releases" as such, but
-   are available as previews of the code on which future releases are
-   to be based.
-
-   The naming scheme in MySQL 5.5 uses release names that consist of
-   three numbers and a suffix; for example, mysql-5.5.6-m3. The
-   numbers within the release name are interpreted as follows:
-
-     * The first number (5) is the major version and describes the
-       file format. All MySQL 5 releases have the same file format.
-
-     * The second number (5) is the release level. Taken together,
-       the major version and release level constitute the release
-       series number.
-
-     * The third number (6) is the version number within the release
-       series. This is incremented for each new release. Usually you
-       want the latest version for the series you have chosen.
-
-   For each minor update, the last number in the version string is
-   incremented. When there are major new features or minor
-   incompatibilities with previous versions, the second number in the
-   version string is incremented. When the file format changes, the
-   first number is increased.
-
-   Release names also include a suffix that indicates the stability
-   level of the release. Releases within a series progress through a
-   set of suffixes to indicate how the stability level improves. The
-   possible suffixes are:
-
-     * mN (for example, m1, m2, m3, ...) indicate a milestone number.
-       MySQL development uses a milestone model, in which each
-       milestone proceeds through a small number of versions with a
-       tight focus on a small subset of thoroughly tested features.
-       Following the releases for one milestone, development proceeds
-       with another small number of releases that focuses on the next
-       small set of features, also thoroughly tested. Features within
-       milestone releases may be considered to be of pre-production
-       quality.
-
-     * rc indicates a Release Candidate. Release candidates are
-       believed to be stable, having passed all of MySQL's internal
-       testing, and with all known fatal runtime bugs fixed. However,
-       the release has not been in widespread use long enough to know
-       for sure that all bugs have been identified. Only minor fixes
-       are added.
+   MySQL is available on a number of operating systems and
+   platforms. For information about those platforms that are
+   officially supported, see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   on the MySQL Web site.
+
+2.1.2 Which MySQL Version and Distribution to Install
+
+   When preparing to install MySQL, you should decide which
+   version to use, and which distribution format (binary or
+   source) to use for the installation.
+
+   First, decide if you want to install a development release or
+   a GA release. Development releases have the newest features,
+   but are not recommended for production use. GA (General
+   Availability) releases, also called production or stable
+   releases, are meant for production use. We recommend to use
+   the most recent GA release.
+
+   The naming scheme in MySQL 5.5 uses release names that
+   consist of three numbers and a suffix; for example,
+   mysql-5.6.1-m1. The numbers within the release name are
+   interpreted as follows:
+
+     * The first number (5) is the major version and describes
+       the file format. All MySQL 5 releases have the same file
+       format.
+
+     * The second number (6) is the release level. Taken
+       together, the major version and release level constitute
+       the release series number.
+
+     * The third number (1) is the version number within the
+       release series. This is incremented for each new release.
+       Usually you want the latest version for the series you
+       have chosen.
+
+   For each minor update, the last number in the version string
+   is incremented. When there are major new features or minor
+   incompatibilities with previous versions, the second number
+   in the version string is incremented. When the file format
+   changes, the first number is increased.
+
+   Release names can also include a suffix that indicates the
+   stability level of the release. Releases within a series
+   progress through a set of suffixes to indicate how the
+   stability level improves. The possible suffixes are:
 
      * If there is no suffix, it indicates that the release is a
-       General Availability (GA) or Production release. GA releases
-       are stable, having successfully passed through all earlier
-       release stages and are believed to be reliable, free of
-       serious bugs, and suitable for use in production systems. Only
-       critical bugfixes are applied to the release.
-
-   All releases of MySQL are run through our standard tests and
-   benchmarks to ensure that they are relatively safe to use. Because
-   the standard tests are extended over time to check for all
-   previously found bugs, the test suite keeps getting better.
-
-   All releases have been tested at least with these tools:
-
-     * An internal test suite.  The mysql-test directory contains an
-       extensive set of test cases. We run these tests for every
-       server binary. See Section 24.1.2, "The MySQL Test Suite," for
-       more information about this test suite.
-
-     * The MySQL benchmark suite.  This suite runs a range of common
-       queries. It is also a test to determine whether the latest
-       batch of optimizations actually made the code faster. See
-       Section 8.12.2, "The MySQL Benchmark Suite."
-
-   We also perform additional integration and nonfunctional testing
-   of the latest MySQL version in our internal production
-   environment. Integration testing is done with different
-   connectors, storage engines, replication modes, backup,
-   partitioning, stored programs, and so forth in various
-   combinations. Additional nonfunctional testing is done in areas of
-   performance, concurrency, stress, high volume, upgrade and
-   downgrade.
-
-2.1.2.2 Choosing a Distribution Format
-
-   After choosing which version of MySQL to install, you should
-   decide whether to use a binary distribution or a source
-   distribution. In most cases, you should probably use a binary
-   distribution, if one exists for your platform. Binary
-   distributions are available in native format for many platforms,
-   such as RPM packages for Linux, DMG packages for Mac OS X, and PKG
-   packages for Solaris. Distributions are also available in more
-   generic formats such as Zip archives or compressed tar files.
-
-   Reasons to choose a binary distribution include the following:
-
-     * Binary distributions generally are easier to install than
-       source distributions.
-
-     * To satisfy different user requirements, we provide several
-       servers in binary distributions. mysqld is an optimized server
-       that is a smaller, faster binary. mysqld-debug is compiled
-       with debugging support.
-       Each of these servers is compiled from the same source
-       distribution, though with different configuration options. All
-       native MySQL clients can connect to servers from either MySQL
-       version.
+       General Availability (GA) or Production release. GA
+       releases are stable, having successfully passed through
+       all earlier release stages and are believed to be
+       reliable, free of serious bugs, and suitable for use in
+       production systems. Only critical bugfixes are applied to
+       the release.
+
+     * mN (for example, m1, m2, m3, ...) indicate a milestone
+       number. MySQL development uses a milestone model, in
+       which each milestone proceeds through a small number of
+       versions with a tight focus on a small subset of
+       thoroughly tested features. Following the releases for
+       one milestone, development proceeds with another small
+       number of releases that focuses on the next small set of
+       features, also thoroughly tested. Features within
+       milestone releases may be considered to be of
+       pre-production quality.
+
+     * rc indicates a Release Candidate. Release candidates are
+       believed to be stable, having passed all of MySQL's
+       internal testing, and with all known fatal runtime bugs
+       fixed. However, the release has not been in widespread
+       use long enough to know for sure that all bugs have been
+       identified. Only minor fixes are added.
+
+   Once you've chosen which MySQL version to install, you need
+   to decide which distribution to install for your operating
+   system. For most use cases, a binary distribution is the
+   right choice. Binary distributions are available in native
+   format for many platforms, such as RPM packages for Linux, or
+   DMG packages for Mac OS X. Distributions are also available
+   in more generic formats such as Zip archives or compressed
+   tar files. On Windows, you can use the MySQL Installer to
+   install a binary distribution.
 
-   Under some circumstances, you may be better off installing MySQL
-   from a source distribution:
+   Under some circumstances, you may be better off installing
+   MySQL from a source distribution:
 
      * You want to install MySQL at some explicit location. The
        standard binary distributions are ready to run at any
@@ -307,103 +226,66 @@ Production Releases
        flexibility to place MySQL components where you want.
 
      * You want to configure mysqld to ensure that features are
-       available that might not be included in the standard binary
-       distributions. Here is a list of the most common extra options
-       that you may want to use to ensure feature availability:
+       available that might not be included in the standard
+       binary distributions. Here is a list of the most common
+       extra options that you may want to use to ensure feature
+       availability:
 
           + -DWITH_LIBWRAP=1 for TCP wrappers support.
 
-          + -DWITH_ZLIB={system|bundled} for features that depend on
-            compression
+          + -DWITH_ZLIB={system|bundled} for features that
+            depend on compression
 
           + -DWITH_DEBUG=1 for debugging support
        For additional information, see Section 2.9.4, "MySQL
        Source-Configuration Options."
 
-     * You want to configure mysqld without some features that are
-       included in the standard binary distributions. For example,
-       distributions normally are compiled with support for all
-       character sets. If you want a smaller MySQL server, you can
-       recompile it with support for only the character sets you
-       need.
+     * You want to configure mysqld without some features that
+       are included in the standard binary distributions. For
+       example, distributions normally are compiled with support
+       for all character sets. If you want a smaller MySQL
+       server, you can recompile it with support for only the
+       character sets you need.
 
-     * You want to use the latest sources from one of the Bazaar
+     * You want to use the latest sources from one of the Git
        repositories to have access to all current bugfixes. For
-       example, if you have found a bug and reported it to the MySQL
-       development team, the bugfix is committed to the source
-       repository and you can access it there. The bugfix does not
-       appear in a release until a release actually is issued.
-
-     * You want to read (or modify) the C and C++ code that makes up
-       MySQL. For this purpose, you should get a source distribution,
-       because the source code is always the ultimate manual.
+       example, if you have found a bug and reported it to the
+       MySQL development team, the bugfix is committed to the
+       source repository and you can access it there. The bugfix
+       does not appear in a release until a release actually is
+       issued.
+
+     * You want to read (or modify) the C and C++ code that
+       makes up MySQL. For this purpose, you should get a source
+       distribution.
 
      * Source distributions contain more tests and examples than
        binary distributions.
 
-2.1.2.3 How and When Updates Are Released
-
-   MySQL is evolving quite rapidly and we want to share new
-   developments with other MySQL users. We try to produce a new
-   release whenever we have new and useful features that others also
-   seem to have a need for.
-
-   We also try to help users who request features that are easy to
-   implement. We take note of what our licensed users want, and we
-   especially take note of what our support customers want and try to
-   help them in this regard.
-
-   No one is required to download a new release. The Release Notes
-   (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) help you
-   determine whether the new release has something you really want.
-
-   We use the following policy when updating MySQL:
-
-     * Enterprise Server releases are meant to appear every 18
-       months, supplemented by quarterly service packs and monthly
-       rapid updates. Community Server releases are meant to appear 2
-       to 3 times per year.
-
-     * Releases are issued within each series. For each release, the
-       last number in the version is one more than the previous
-       release within the same series.
-
-     * Binary distributions for some platforms are made by us for
-       major releases. Other people may make binary distributions for
-       other systems, but probably less frequently.
-
-     * We make fixes available as soon as we have identified and
-       corrected small or noncritical but annoying bugs. The fixes
-       are available in source form immediately from our public
-       Bazaar repositories, and are included in the next release.
-
-     * If by any chance a security vulnerability or critical bug is
-       found in a release, our policy is to fix it in a new release
-       as soon as possible. (We would like other companies to do
-       this, too!)
-
 2.1.3 How to Get MySQL
 
-   Check our downloads page at http://dev.mysql.com/downloads/ for
-   information about the current version of MySQL and for downloading
-   instructions. For a complete up-to-date list of MySQL download
-   mirror sites, see http://dev.mysql.com/downloads/mirrors.html. You
-   can also find information there about becoming a MySQL mirror site
-   and how to report a bad or out-of-date mirror.
+   Check our downloads page at http://dev.mysql.com/downloads/
+   for information about the current version of MySQL and for
+   downloading instructions. For a complete up-to-date list of
+   MySQL download mirror sites, see
+   http://dev.mysql.com/downloads/mirrors.html. You can also
+   find information there about becoming a MySQL mirror site and
+   how to report a bad or out-of-date mirror.
 
    To obtain the latest development source, see Section 2.9.3,
    "Installing MySQL Using a Development Source Tree."
 
 2.1.4 Verifying Package Integrity Using MD5 Checksums or GnuPG
 
-   After you have downloaded the MySQL package that suits your needs
-   and before you attempt to install it, you should make sure that it
-   is intact and has not been tampered with. There are three means of
-   integrity checking:
+   After you have downloaded the MySQL package that suits your
+   needs and before you attempt to install it, you should make
+   sure that it is intact and has not been tampered with. There
+   are three means of integrity checking:
 
      * MD5 checksums
 
-     * Cryptographic signatures using GnuPG, the GNU Privacy Guard
+     * Cryptographic signatures using GnuPG, the GNU Privacy
+       Guard
 
      * For RPM packages, the built-in RPM integrity verification
        mechanism
@@ -411,70 +293,72 @@ Production Releases
    The following sections describe how to use these methods.
 
    If you notice that the MD5 checksum or GPG signatures do not
-   match, first try to download the respective package one more time,
-   perhaps from another mirror site.
+   match, first try to download the respective package one more
+   time, perhaps from another mirror site.
 
 2.1.4.1 Verifying the MD5 Checksum
 
-   After you have downloaded a MySQL package, you should make sure
-   that its MD5 checksum matches the one provided on the MySQL
-   download pages. Each package has an individual checksum that you
-   can verify against the package that you downloaded. The correct
-   MD5 checksum is listed on the downloads page for each MySQL
-   product, and you will compare it against the MD5 checksum of the
-   file (product) that you download.
-
-   Each operating system and setup offers its own version of tools
-   for checking the MD5 checksum. Typically the command is named
-   md5sum, or it may be named md5, and some operating systems do not
-   ship it at all. On Linux, it is part of the GNU Text Utilities
-   package, which is available for a wide range of platforms. You can
-   also download the source code from
-   http://www.gnu.org/software/textutils/. If you have OpenSSL
-   installed, you can use the command openssl md5 package_name
-   instead. A Windows implementation of the md5 command line utility
-   is available from http://www.fourmilab.ch/md5/. winMd5Sum is a
-   graphical MD5 checking tool that can be obtained from
-   http://www.nullriver.com/index/products/winmd5sum. Our Microsoft
-   Windows examples will assume the name md5.exe.
+   After you have downloaded a MySQL package, you should make
+   sure that its MD5 checksum matches the one provided on the
+   MySQL download pages. Each package has an individual checksum
+   that you can verify against the package that you downloaded.
+   The correct MD5 checksum is listed on the downloads page for
+   each MySQL product, and you will compare it against the MD5
+   checksum of the file (product) that you download.
+
+   Each operating system and setup offers its own version of
+   tools for checking the MD5 checksum. Typically the command is
+   named md5sum, or it may be named md5, and some operating
+   systems do not ship it at all. On Linux, it is part of the
+   GNU Text Utilities package, which is available for a wide
+   range of platforms. You can also download the source code
+   from http://www.gnu.org/software/textutils/. If you have
+   OpenSSL installed, you can use the command openssl md5
+   package_name instead. A Windows implementation of the md5
+   command line utility is available from
+   http://www.fourmilab.ch/md5/. winMd5Sum is a graphical MD5
+   checking tool that can be obtained from
+   http://www.nullriver.com/index/products/winmd5sum. Our
+   Microsoft Windows examples will assume the name md5.exe.
 
    Linux and Microsoft Windows examples:
-shell> md5sum mysql-standard-5.5.41-linux-i686.tar.gz
-aaab65abbec64d5e907dcd41b8699945  mysql-standard-5.5.41-linux-i686.ta
-r.gz
-shell> md5.exe mysql-installer-community-5.5.41.msi
-aaab65abbec64d5e907dcd41b8699945  mysql-installer-community-5.5.41.ms
-i
+shell> md5sum mysql-standard-5.5.42-linux-i686.tar.gz
+aaab65abbec64d5e907dcd41b8699945  mysql-standard-5.5.42-linux-i686.tar
+.gz
+
+shell> md5.exe mysql-installer-community-5.5.42.msi
+aaab65abbec64d5e907dcd41b8699945  mysql-installer-community-5.5.42.msi
 
    You should verify that the resulting checksum (the string of
-   hexadecimal digits) matches the one displayed on the download page
-   immediately below the respective package.
+   hexadecimal digits) matches the one displayed on the download
+   page immediately below the respective package.
    Note
 
-   Make sure to verify the checksum of the archive file (for example,
-   the .zip, .tar.gz, or .msi file) and not of the files that are
-   contained inside of the archive. In other words, verify the file
-   before extracting its contents.
+   Make sure to verify the checksum of the archive file (for
+   example, the .zip, .tar.gz, or .msi file) and not of the
+   files that are contained inside of the archive. In other
+   words, verify the file before extracting its contents.
 
 2.1.4.2 Signature Checking Using GnuPG
 
-   Another method of verifying the integrity and authenticity of a
-   package is to use cryptographic signatures. This is more reliable
-   than using MD5 checksums, but requires more work.
+   Another method of verifying the integrity and authenticity of
+   a package is to use cryptographic signatures. This is more
+   reliable than using MD5 checksums, but requires more work.
 
    We sign MySQL downloadable packages with GnuPG (GNU Privacy
    Guard). GnuPG is an Open Source alternative to the well-known
    Pretty Good Privacy (PGP) by Phil Zimmermann. See
-   http://www.gnupg.org/ for more information about GnuPG and how to
-   obtain and install it on your system. Most Linux distributions
-   ship with GnuPG installed by default. For more information about
-   GnuPG, see http://www.openpgp.org/.
-
-   To verify the signature for a specific package, you first need to
-   obtain a copy of our public GPG build key, which you can download
-   from http://pgp.mit.edu/. The key that you want to obtain is named
-   mysql-build@oss.oracle.com. Alternatively, you can cut and paste
-   the key directly from the following text:
+   http://www.gnupg.org/ for more information about GnuPG and
+   how to obtain and install it on your system. Most Linux
+   distributions ship with GnuPG installed by default. For more
+   information about GnuPG, see http://www.openpgp.org/.
+
+   To verify the signature for a specific package, you first
+   need to obtain a copy of our public GPG build key, which you
+   can download from http://pgp.mit.edu/. The key that you want
+   to obtain is named mysql-build@oss.oracle.com. Alternatively,
+   you can cut and paste the key directly from the following
+   text:
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.9 (SunOS)
 
@@ -572,9 +456,10 @@ AcOphrnJ
 =443I
 -----END PGP PUBLIC KEY BLOCK-----
 
-   To import the build key into your personal public GPG keyring, use
-   gpg --import. For example, if you have saved the key in a file
-   named mysql_pubkey.asc, the import command looks like this:
+   To import the build key into your personal public GPG
+   keyring, use gpg --import. For example, if you have saved the
+   key in a file named mysql_pubkey.asc, the import command
+   looks like this:
 shell> gpg --import mysql_pubkey.asc
 gpg: key 5072E1F5: public key "MySQL Release Engineering
 <mysql-build@oss.oracle.com>" imported
@@ -582,15 +467,15 @@ gpg: Total number processed: 1
 gpg:               imported: 1
 gpg: no ultimately trusted keys found
 
-   You can also download the key from the public keyserver using the
-   public key id, 5072E1F5:
+   You can also download the key from the public keyserver using
+   the public key id, 5072E1F5:
 shell> gpg --recv-keys 5072E1F5
 gpg: requesting key 5072E1F5 from hkp server keys.gnupg.net
-gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle
-.com>"
+gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle.
+com>"
 1 new user ID
-gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle
-.com>"
+gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle.
+com>"
 53 new signatures
 gpg: no ultimately trusted keys found
 gpg: Total number processed: 1
@@ -598,138 +483,143 @@ gpg:           new user IDs: 1
 gpg:         new signatures: 53
 
    If you want to import the key into your RPM configuration to
-   validate RPM install packages, you should be able to import the
-   key directly:
+   validate RPM install packages, you should be able to import
+   the key directly:
 shell> rpm --import mysql_pubkey.asc
 
-   If you experience problems or require RPM specific information,
-   see Section 2.1.4.4, "Signature Checking Using RPM."
+   If you experience problems or require RPM specific
+   information, see Section 2.1.4.4, "Signature Checking Using
+   RPM."
 
    After you have downloaded and imported the public build key,
    download your desired MySQL package and the corresponding
-   signature, which also is available from the download page. The
-   signature file has the same name as the distribution file with an
-   .asc extension, as shown by the examples in the following table.
+   signature, which also is available from the download page.
+   The signature file has the same name as the distribution file
+   with an .asc extension, as shown by the examples in the
+   following table.
 
    Table 2.1 MySQL Package and Signature Files for Source files
        File Type                      File Name
-   Distribution file mysql-standard-5.5.41-linux-i686.tar.gz
-   Signature file    mysql-standard-5.5.41-linux-i686.tar.gz.asc
+   Distribution file mysql-standard-5.5.42-linux-i686.tar.gz
+   Signature file    mysql-standard-5.5.42-linux-i686.tar.gz.asc
 
-   Make sure that both files are stored in the same directory and
-   then run the following command to verify the signature for the
-   distribution file:
+   Make sure that both files are stored in the same directory
+   and then run the following command to verify the signature
+   for the distribution file:
 shell> gpg --verify package_name.asc
 
    If the downloaded package is valid, you will see a "Good
    signature" similar to:
-shell> gpg --verify mysql-standard-5.5.41-linux-i686.tar.gz.asc
-gpg: Signature made Tue 01 Feb 2011 02:38:30 AM CST using DSA key ID
-5072E1F5
-gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.
-oracle.com>"
-
-   The Good signature message indicates that the file signature is
-   valid, when compared to the signature listed on our site. But you
-   might also see warnings, like so:
-shell> gpg --verify mysql-standard-5.5.41-linux-i686.tar.gz.asc
-gpg: Signature made Wed 23 Jan 2013 02:25:45 AM PST using DSA key ID
-5072E1F5
+shell> gpg --verify mysql-standard-5.5.42-linux-i686.tar.gz.asc
+gpg: Signature made Tue 01 Feb 2011 02:38:30 AM CST using DSA key ID 5
+072E1F5
+gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.o
+racle.com>"
+
+   The Good signature message indicates that the file signature
+   is valid, when compared to the signature listed on our site.
+   But you might also see warnings, like so:
+shell> gpg --verify mysql-standard-5.5.42-linux-i686.tar.gz.asc
+gpg: Signature made Wed 23 Jan 2013 02:25:45 AM PST using DSA key ID 5
+072E1F5
 gpg: checking the trustdb
 gpg: no ultimately trusted keys found
-gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.
-oracle.com>"
+gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.o
+racle.com>"
 gpg: WARNING: This key is not certified with a trusted signature!
-gpg:          There is no indication that the signature belongs to th
-e owner.
-Primary key fingerprint: A4A9 4068 76FC BD3C 4567  70C8 8C71 8D3B 507
-2 E1F5
-
-   That is normal, as they depend on your setup and configuration.
-   Here are explanations for these warnings:
-
-     * gpg: no ultimately trusted keys found: This means that the
-       specific key is not "ultimately trusted" by you or your web of
-       trust, which is okay for the purposes of verifying file
-       signatures.
-
-     * WARNING: This key is not certified with a trusted signature!
-       There is no indication that the signature belongs to the
-       owner.: This refers to your level of trust in your belief that
-       you possess our real public key. This is a personal decision.
-       Ideally, a MySQL developer would hand you the key in person,
-       but more commonly, you downloaded it. Was the download
-       tampered with? Probably not, but this decision is up to you.
-       Setting up a web of trust is one method for trusting them.
+gpg:          There is no indication that the signature belongs to the
+ owner.
+Primary key fingerprint: A4A9 4068 76FC BD3C 4567  70C8 8C71 8D3B 5072
+ E1F5
+
+   That is normal, as they depend on your setup and
+   configuration. Here are explanations for these warnings:
+
+     * gpg: no ultimately trusted keys found: This means that
+       the specific key is not "ultimately trusted" by you or
+       your web of trust, which is okay for the purposes of
+       verifying file signatures.
+
+     * WARNING: This key is not certified with a trusted
+       signature! There is no indication that the signature
+       belongs to the owner.: This refers to your level of trust
+       in your belief that you possess our real public key. This
+       is a personal decision. Ideally, a MySQL developer would
+       hand you the key in person, but more commonly, you
+       downloaded it. Was the download tampered with? Probably
+       not, but this decision is up to you. Setting up a web of
+       trust is one method for trusting them.
 
-   See the GPG documentation for more information on how to work with
-   public keys.
+   See the GPG documentation for more information on how to work
+   with public keys.
 
 2.1.4.3 Signature Checking Using Gpg4win for Windows
 
    The Section 2.1.4.2, "Signature Checking Using GnuPG" section
-   describes how to verify MySQL downloads using GPG. That guide also
-   applies to Microsoft Windows, but another option is to use a GUI
-   tool like Gpg4win (http://www.gpg4win.org/). You may use a
-   different tool but our examples are based on Gpg4win, and utilize
-   its bundled Kleopatra GUI.
+   describes how to verify MySQL downloads using GPG. That guide
+   also applies to Microsoft Windows, but another option is to
+   use a GUI tool like Gpg4win (http://www.gpg4win.org/). You
+   may use a different tool but our examples are based on
+   Gpg4win, and utilize its bundled Kleopatra GUI.
 
-   Download and install Gpg4win, and then load Kleopatra. The dialog
-   should look similar to:
+   Download and install Gpg4win, and then load Kleopatra. The
+   dialog should look similar to:
 
    Figure 2.1 Initial screen after loading Kleopatra
    Initial screen after loading Kleopatra
 
-   Next, add the MySQL Release Engineering certificate. Do this by
-   clicking File, Lookup Certificates on Server. Type "Mysql Release
-   Engineering" into the search box and press Search.
+   Next, add the MySQL Release Engineering certificate. Do this
+   by clicking File, Lookup Certificates on Server. Type "Mysql
+   Release Engineering" into the search box and press Search.
 
    Figure 2.2 Finding the MySQL Release Engineering certificate
    Finding the MySQL Release Engineering certificate
 
    Select the "MySQL Release Engineering" certificate. The
-   Fingerprint and Key-ID must be "5072E1F5", or choose Details... to
-   confirm the certificate is valid. Now, import it by clicking
-   Import. An import dialog will be displayed, choose Okay, and this
-   certificate will now be listed under the Imported Certificates
-   tab.
-
-   Next, configure the trust level for our certificate. Select our
-   certificate, then from the main menu select Certificates, Change
-   Owner Trust.... We suggest choosing I believe checks are very
-   accurate for our certificate, as otherwise you might not be able
-   to verify our signature. Select I believe checks are very accurate
-   and then press OK.
+   Fingerprint and Key-ID must be "5072E1F5", or choose
+   Details... to confirm the certificate is valid. Now, import
+   it by clicking Import. An import dialog will be displayed,
+   choose Okay, and this certificate will now be listed under
+   the Imported Certificates tab.
+
+   Next, configure the trust level for our certificate. Select
+   our certificate, then from the main menu select Certificates,
+   Change Owner Trust.... We suggest choosing I believe checks
+   are very accurate for our certificate, as otherwise you might
+   not be able to verify our signature. Select I believe checks
+   are very accurate and then press OK.
 
    Figure 2.3 Changing the Trust level
    Changing the Trust level
 
    Next, verify the downloaded MySQL package file. This requires
-   files for both the packaged file, and the signature. The signature
-   file must have the same name as the packaged file but with an
-   appended .asc extension, as shown by the example in the following
-   table. The signature is linked to on the downloads page for each
-   MySQL product. You must create the .asc file with this signature.
+   files for both the packaged file, and the signature. The
+   signature file must have the same name as the packaged file
+   but with an appended .asc extension, as shown by the example
+   in the following table. The signature is linked to on the
+   downloads page for each MySQL product. You must create the
+   .asc file with this signature.
 
-   Table 2.2 MySQL Package and Signature Files for MySQL Installer
-   for Microsoft Windows
+   Table 2.2 MySQL Package and Signature Files for MySQL
+   Installer for Microsoft Windows
        File Type                    File Name
-   Distribution file mysql-installer-community-5.5.41.msi
-   Signature file    mysql-installer-community-5.5.41.msi.asc
+   Distribution file mysql-installer-community-5.5.42.msi
+   Signature file    mysql-installer-community-5.5.42.msi.asc
 
-   Make sure that both files are stored in the same directory and
-   then run the following command to verify the signature for the
-   distribution file. Either drag and drop the signature (.asc) file
-   into Kleopatra, or load the dialog from File, Decrypt/Verify
-   Files..., and then choose either the .msi or .asc file.
+   Make sure that both files are stored in the same directory
+   and then run the following command to verify the signature
+   for the distribution file. Either drag and drop the signature
+   (.asc) file into Kleopatra, or load the dialog from File,
+   Decrypt/Verify Files..., and then choose either the .msi or
+   .asc file.
 
    Figure 2.4 The Decrypt/Verify Files dialog
    The Decrypt/Verify Files dialog
 
    Click Decrypt/Verify to check the file. The two most common
    results will look like the following, and although the yellow
-   warning looks problematic, the following means that the file check
-   passed with success. You may now run this installer.
+   warning looks problematic, the following means that the file
+   check passed with success. You may now run this installer.
 
    Figure 2.5 The Decrypt/Verify Results: Good
    The Decrypt/Verify Results: Good
@@ -741,59 +631,60 @@ Primary key fingerprint: A4A9 4068 76FC
    The Decrypt/Verify Results: Bad
 
    The Section 2.1.4.2, "Signature Checking Using GnuPG" section
-   explains why you probably don't see a green Good signature result.
+   explains why you probably don't see a green Good signature
+   result.
 
 2.1.4.4 Signature Checking Using RPM
 
-   For RPM packages, there is no separate signature. RPM packages
-   have a built-in GPG signature and MD5 checksum. You can verify a
-   package by running the following command:
+   For RPM packages, there is no separate signature. RPM
+   packages have a built-in GPG signature and MD5 checksum. You
+   can verify a package by running the following command:
 shell> rpm --checksig package_name.rpm
 
    Example:
-shell> rpm --checksig MySQL-server-5.5.41-0.glibc23.i386.rpm
-MySQL-server-5.5.41-0.glibc23.i386.rpm: md5 gpg OK
+shell> rpm --checksig MySQL-server-5.5.42-0.glibc23.i386.rpm
+MySQL-server-5.5.42-0.glibc23.i386.rpm: md5 gpg OK
 
    Note
 
    If you are using RPM 4.1 and it complains about (GPG) NOT OK
-   (MISSING KEYS: GPG#5072e1f5), even though you have imported the
-   MySQL public build key into your own GPG keyring, you need to
-   import the key into the RPM keyring first. RPM 4.1 no longer uses
-   your personal GPG keyring (or GPG itself). Rather, RPM maintains a
-   separate keyring because it is a system-wide application and a
-   user's GPG public keyring is a user-specific file. To import the
-   MySQL public key into the RPM keyring, first obtain the key, then
-   use rpm --import to import the key. For example:
+   (MISSING KEYS: GPG#5072e1f5), even though you have imported
+   the MySQL public build key into your own GPG keyring, you
+   need to import the key into the RPM keyring first. RPM 4.1 no
+   longer uses your personal GPG keyring (or GPG itself).
+   Rather, RPM maintains a separate keyring because it is a
+   system-wide application and a user's GPG public keyring is a
+   user-specific file. To import the MySQL public key into the
+   RPM keyring, first obtain the key, then use rpm --import to
+   import the key. For example:
 shell> gpg --export -a 5072e1f5 > 5072e1f5.asc
 shell> rpm --import 5072e1f5.asc
 
-   Alternatively, rpm also supports loading the key directly from a
-   URL, and you can use this manual page:
-shell> rpm --import http://dev.mysql.com/doc/refman/5.5/en/checking-g
-pg-signature.html
+   Alternatively, rpm also supports loading the key directly
+   from a URL, and you can use this manual page:
+shell> rpm --import doc/refman/5.5/en/checking-gpg-signature.html
 
-   If you need to obtain the MySQL public key, see Section 2.1.4.2,
-   "Signature Checking Using GnuPG."
+   If you need to obtain the MySQL public key, see Section
+   2.1.4.2, "Signature Checking Using GnuPG."
 
 2.1.5 Installation Layouts
 
-   The installation layout differs for different installation types
-   (for example, native packages, binary tarballs, and source
-   tarballs), which can lead to confusion when managing different
-   systems or using different installation sources. The individual
-   layouts are given in the corresponding installation type or
-   platform chapter, as described following. Note that the layout of
-   installations from vendors other than Oracle may differ from these
-   layouts.
+   The installation layout differs for different installation
+   types (for example, native packages, binary tarballs, and
+   source tarballs), which can lead to confusion when managing
+   different systems or using different installation sources.
+   The individual layouts are given in the corresponding
+   installation type or platform chapter, as described
+   following. Note that the layout of installations from vendors
+   other than Oracle may differ from these layouts.
 
      * Section 2.3.1, "MySQL Installation Layout on Microsoft
        Windows"
 
      * Section 2.9.1, "MySQL Layout for Source Installation"
 
-     * Section 2.2, "MySQL Installation Layout for Generic Unix/Linux
-       Binary Package"
+     * Section 2.2, "MySQL Installation Layout for Generic
+       Unix/Linux Binary Package"
 
      * Section 2.5.1, "MySQL Installation Layout for Linux RPM
        Packages"
@@ -803,9 +694,9 @@ pg-signature.html
 2.1.6 Compiler-Specific Build Characteristics
 
    In some cases, the compiler used to build MySQL affects the
-   features available for use. The notes in this section apply for
-   binary distributions provided by Oracle Corporation or that you
-   compile yourself from source.
+   features available for use. The notes in this section apply
+   for binary distributions provided by Oracle Corporation or
+   that you compile yourself from source.
 
    icc (Intel C++ Compiler) Builds
 
@@ -816,59 +707,63 @@ pg-signature.html
 2.2 Installing MySQL on Unix/Linux Using Generic Binaries
 
    Oracle provides a set of binary distributions of MySQL. These
-   include binary distributions in the form of compressed tar files
-   (files with a .tar.gz extension) for a number of platforms, as
-   well as binaries in platform-specific package formats for selected
-   platforms.
-
-   This section covers the installation of MySQL from a compressed
-   tar file binary distribution. For other platform-specific package
-   formats, see the other platform-specific sections. For example,
-   for Windows distributions, see Section 2.3, "Installing MySQL on
+   include binary distributions in the form of compressed tar
+   files (files with a .tar.gz extension) for a number of
+   platforms, as well as binaries in platform-specific package
+   formats for selected platforms.
+
+   This section covers the installation of MySQL from a
+   compressed tar file binary distribution. For other
+   platform-specific package formats, see the other
+   platform-specific sections. For example, for Windows
+   distributions, see Section 2.3, "Installing MySQL on
    Microsoft Windows."
 
    To obtain MySQL, see Section 2.1.3, "How to Get MySQL."
 
-   MySQL compressed tar file binary distributions have names of the
-   form mysql-VERSION-OS.tar.gz, where VERSION is a number (for
-   example, 5.5.41), and OS indicates the type of operating system
-   for which the distribution is intended (for example, pc-linux-i686
-   or winx64).
-
-   To install MySQL from a compressed tar file binary distribution,
-   your system must have GNU gunzip to uncompress the distribution
-   and a reasonable tar to unpack it. If your tar program supports
-   the z option, it can both uncompress and unpack the file.
+   MySQL compressed tar file binary distributions have names of
+   the form mysql-VERSION-OS.tar.gz, where VERSION is a number
+   (for example, 5.5.42), and OS indicates the type of operating
+   system for which the distribution is intended (for example,
+   pc-linux-i686 or winx64).
+
+   To install MySQL from a compressed tar file binary
+   distribution, your system must have GNU gunzip to uncompress
+   the distribution and a reasonable tar to unpack it. If your
+   tar program supports the z option, it can both uncompress and
+   unpack the file.
 
    GNU tar is known to work. The standard tar provided with some
-   operating systems is not able to unpack the long file names in the
-   MySQL distribution. You should download and install GNU tar, or if
-   available, use a preinstalled version of GNU tar. Usually this is
-   available as gnutar, gtar, or as tar within a GNU or Free Software
-   directory, such as /usr/sfw/bin or /usr/local/bin. GNU tar is
-   available from http://www.gnu.org/software/tar/.
+   operating systems is not able to unpack the long file names
+   in the MySQL distribution. You should download and install
+   GNU tar, or if available, use a preinstalled version of GNU
+   tar. Usually this is available as gnutar, gtar, or as tar
+   within a GNU or Free Software directory, such as /usr/sfw/bin
+   or /usr/local/bin. GNU tar is available from
+   http://www.gnu.org/software/tar/.
    Warning
 
-   If you have previously installed MySQL using your operating system
-   native package management system, such as yum or apt-get, you may
-   experience problems installing using a native binary. Make sure
-   your previous MySQL previous installation has been removed
-   entirely (using your package management system), and that any
-   additional files, such as old versions of your data files, have
-   also been removed. You should also check the existence of
-   configuration files such as /etc/my.cnf or the /etc/mysql
-   directory have been deleted.
-
-   If you run into problems and need to file a bug report, please use
-   the instructions in Section 1.7, "How to Report Bugs or Problems."
-
-   On Unix, to install a compressed tar file binary distribution,
-   unpack it at the installation location you choose (typically
-   /usr/local/mysql). This creates the directories shown in the
-   following table.
+   If you have previously installed MySQL using your operating
+   system native package management system, such as yum or
+   apt-get, you may experience problems installing using a
+   native binary. Make sure your previous MySQL previous
+   installation has been removed entirely (using your package
+   management system), and that any additional files, such as
+   old versions of your data files, have also been removed. You
+   should also check the existence of configuration files such
+   as /etc/my.cnf or the /etc/mysql directory have been deleted.
+
+   If you run into problems and need to file a bug report,
+   please use the instructions in Section 1.7, "How to Report
+   Bugs or Problems."
+
+   On Unix, to install a compressed tar file binary
+   distribution, unpack it at the installation location you
+   choose (typically /usr/local/mysql). This creates the
+   directories shown in the following table.
 
-   Table 2.3 MySQL Installation Layout for Generic Unix/Linux Binary
-   Package
+   Table 2.3 MySQL Installation Layout for Generic Unix/Linux
+   Binary Package
    Directory Contents of Directory
    bin Client programs and the mysqld server
    data Log files, databases
@@ -881,14 +776,15 @@ pg-signature.html
    sample configuration files, SQL for database installation
    sql-bench Benchmarks
 
-   Debug versions of the mysqld binary are available as mysqld-debug.
-   To compile your own debug version of MySQL from a source
-   distribution, use the appropriate configuration options to enable
-   debugging support. For more information on compiling from source,
-   see Section 2.9, "Installing MySQL from Source."
+   Debug versions of the mysqld binary are available as
+   mysqld-debug. To compile your own debug version of MySQL from
+   a source distribution, use the appropriate configuration
+   options to enable debugging support. For more information on
+   compiling from source, see Section 2.9, "Installing MySQL
+   from Source."
 
-   To install and use a MySQL binary distribution, the basic command
-   sequence looks like this:
+   To install and use a MySQL binary distribution, the basic
+   command sequence looks like this:
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 shell> cd /usr/local
@@ -910,43 +806,44 @@ shell> cp support-files/mysql.server /et
    installing a binary distribution follows.
    Note
 
-   This procedure assumes that you have root (administrator) access
-   to your system. Alternatively, you can prefix each command using
-   the sudo (Linux) or pfexec (OpenSolaris) command.
-
-   The procedure does not set up any passwords for MySQL accounts.
-   After following the procedure, proceed to Section 2.10.2,
-   "Securing the Initial MySQL Accounts."
+   This procedure assumes that you have root (administrator)
+   access to your system. Alternatively, you can prefix each
+   command using the sudo (Linux) or pfexec (OpenSolaris)
+   command.
+
+   The procedure does not set up any passwords for MySQL
+   accounts. After following the procedure, proceed to Section
+   2.10.2, "Securing the Initial MySQL Accounts."
 
 Create a mysql User and Group
 
-   If your system does not already have a user and group for mysqld
-   to run as, you may need to create one. The following commands add
-   the mysql group and the mysql user. You might want to call the
-   user and group something else instead of mysql. If so, substitute
-   the appropriate name in the following instructions. The syntax for
-   useradd and groupadd may differ slightly on different versions of
-   Unix, or they may have different names such as adduser and
-   addgroup.
+   If your system does not already have a user and group for
+   mysqld to run as, you may need to create one. The following
+   commands add the mysql group and the mysql user. You might
+   want to call the user and group something else instead of
+   mysql. If so, substitute the appropriate name in the
+   following instructions. The syntax for useradd and groupadd
+   may differ slightly on different versions of Unix, or they
+   may have different names such as adduser and addgroup.
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 
    Note
 
    Because the user is required only for ownership purposes, not
-   login purposes, the useradd command uses the -r option to create a
-   user that does not have login permissions to your server host.
-   Omit this option to permit logins for the user (or if your useradd
-   does not support the option).
+   login purposes, the useradd command uses the -r option to
+   create a user that does not have login permissions to your
+   server host. Omit this option to permit logins for the user
+   (or if your useradd does not support the option).
 
 Obtain and Unpack the Distribution
 
-   Pick the directory under which you want to unpack the distribution
-   and change location into it. The example here unpacks the
-   distribution under /usr/local. The instructions, therefore, assume
-   that you have permission to create files and directories in
-   /usr/local. If that directory is protected, you must perform the
-   installation as root.
+   Pick the directory under which you want to unpack the
+   distribution and change location into it. The example here
+   unpacks the distribution under /usr/local. The instructions,
+   therefore, assume that you have permission to create files
+   and directories in /usr/local. If that directory is
+   protected, you must perform the installation as root.
 shell> cd /usr/local
 
    Obtain a distribution file using the instructions in Section
@@ -954,618 +851,1027 @@ shell> cd /usr/local
    distributions for all platforms are built from the same MySQL
    source distribution.
 
-   Unpack the distribution, which creates the installation directory.
-   Then create a symbolic link to that directory. tar can uncompress
-   and unpack the distribution if it has z option support:
+   Unpack the distribution, which creates the installation
+   directory. Then create a symbolic link to that directory. tar
+   can uncompress and unpack the distribution if it has z option
+   support:
 shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
 shell> ln -s full-path-to-mysql-VERSION-OS mysql
 
-   The tar command creates a directory named mysql-VERSION-OS. The ln
-   command makes a symbolic link to that directory. This enables you
-   to refer more easily to the installation directory as
-   /usr/local/mysql.
-
-   If your tar does not have z option support, use gunzip to unpack
-   the distribution and tar to unpack it. Replace the preceding tar
-   command with the following alternative command to uncompress and
-   extract the distribution:
+   The tar command creates a directory named mysql-VERSION-OS.
+   The ln command makes a symbolic link to that directory. This
+   enables you to refer more easily to the installation
+   directory as /usr/local/mysql.
+
+   If your tar does not have z option support, use gunzip to
+   unpack the distribution and tar to unpack it. Replace the
+   preceding tar command with the following alternative command
+   to uncompress and extract the distribution:
 shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
 
 Perform Postinstallation Setup
 
-   The remainder of the installation process involves setting up the
-   configuration file, creating the core databases, and starting the
-   MySQL server. For next steps, see Section 2.10, "Postinstallation
-   Setup and Testing."
+   The remainder of the installation process involves setting up
+   the configuration file, creating the core databases, and
+   starting the MySQL server. For next steps, see Section 2.10,
+   "Postinstallation Setup and Testing."
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.10.2,
-   "Securing the Initial MySQL Accounts."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
 
 2.3 Installing MySQL on Microsoft Windows
 
+   There are several different methods to install MySQL on
+   Microsoft Windows.
+
+Simple Installation Method
+
+   The simplest and recommended method is to download MySQL
+   Installer (for Windows) and let it install and configure all
+   of the MySQL products on your system. Here is how:
+
+     * Download MySQL Installer from
+       http://dev.mysql.com/downloads/installer/ and execute it.
+       Note
+       Unlike the standard MySQL Installer, the smaller
+       "web-community" version does not bundle any MySQL
+       applications but it will download the MySQL products you
+       choose to install.
+
+     * Choose the appropriate Setup Type for your system.
+       Typically you will choose Developer Default to install
+       MySQL server and other MySQL tools related to MySQL
+       development, helpful tools like MySQL Workbench. Or,
+       choose the Custom setup type to manually select your
+       desired MySQL products.
+       Note
+       Multiple versions of MySQL server can exist on a single
+       system. You can choose one or multiple versions.
+
+     * Complete the installation process by following the MySQL
+       Installation wizard's instructions. This will install
+       several MySQL products and start the MySQL server.
+
+     * MySQL is now installed. You probably configured MySQL as
+       a service that will automatically start MySQL server
+       every time you restart your system.
+
+   Note
+
+   You probably also installed other helpful MySQL products like
+   MySQL Workbench and MySQL Notifier on your system. Consider
+   loading Chapter 26, "MySQL Workbench" to check your new MySQL
+   server connection, and Section 2.3.4, "MySQL Notifier" to
+   view the connection's status. By default, these two programs
+   automatically start after installing MySQL.
+
+   This process also installs the MySQL Installer application on
+   your system, and later you can use MySQL Installer to upgrade
+   or reconfigure your MySQL products.
+
+Additional Installation Information
+
    MySQL is available for Microsoft Windows, for both 32-bit and
-   64-bit versions. For supported Windows platform information, see
-   http://www.mysql.com/support/supportedplatforms/database.html.
+   64-bit versions. For supported Windows platform information,
+   see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
 
    It is possible to run MySQL as a standard application or as a
-   Windows service. By using a service, you can monitor and control
-   the operation of the server through the standard Windows service
-   management tools. For more information, see Section 2.3.7.7,
-   "Starting MySQL as a Windows Service."
-
-   Generally, you should install MySQL on Windows using an account
-   that has administrator rights. Otherwise, you may encounter
-   problems with certain operations such as editing the PATH
-   environment variable or accessing the Service Control Manager.
-   Once installed, MySQL does not need to be executed using a user
-   with Administrator privileges.
+   Windows service. By using a service, you can monitor and
+   control the operation of the server through the standard
+   Windows service management tools. For more information, see
+   Section 2.3.7.7, "Starting MySQL as a Windows Service."
+
+   Generally, you should install MySQL on Windows using an
+   account that has administrator rights. Otherwise, you may
+   encounter problems with certain operations such as editing
+   the PATH environment variable or accessing the Service
+   Control Manager. Once installed, MySQL does not need to be
+   executed using a user with Administrator privileges.
 
    For a list of limitations on the use of MySQL on the Windows
    platform, see Section D.10.6, "Windows Platform Limitations."
 
    In addition to the MySQL Server package, you may need or want
    additional components to use MySQL with your application or
-   development environment. These include, but are not limited to:
+   development environment. These include, but are not limited
+   to:
 
-     * To connect to the MySQL server using ODBC, you must have a
-       Connector/ODBC driver. For more information, including
+     * To connect to the MySQL server using ODBC, you must have
+       a Connector/ODBC driver. For more information, including
        installation and configuration instructions, see MySQL
        Connector/ODBC Developer Guide
        (http://dev.mysql.com/doc/connector-odbc/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/ODBC
+       for you.
 
-     * To use MySQL server with .NET applications, you must have the
-       Connector/Net driver. For more information, including
+     * To use MySQL server with .NET applications, you must have
+       the Connector/Net driver. For more information, including
        installation and configuration instructions, see MySQL
        Connector/Net Developer Guide
        (http://dev.mysql.com/doc/connector-net/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/NET
+       for you.
 
    MySQL distributions for Windows can be downloaded from
-   http://dev.mysql.com/downloads/. See Section 2.1.3, "How to Get
-   MySQL."
+   http://dev.mysql.com/downloads/. See Section 2.1.3, "How to
+   Get MySQL."
 
-   MySQL for Windows is available in several distribution formats,
-   detailed below. Generally speaking, you should use MySQL
-   Installer. It contains more features and MySQL products than the
-   older MSI, is simpler to use than the ZIP file, and you need no
-   additional tools to get MySQL up and running. MySQL Installer
-   automatically installs MySQL Server and additional MySQL products,
-   creates an options file, starts the server, and enables you to
-   create default user accounts. For more information on choosing a
-   package, see Section 2.3.2, "Choosing An Installation Package."
+   MySQL for Windows is available in several distribution
+   formats, detailed below. Generally speaking, you should use
+   MySQL Installer. It contains more features and MySQL products
+   than the older MSI, is simpler to use than the ZIP file, and
+   you need no additional tools to get MySQL up and running.
+   MySQL Installer automatically installs MySQL Server and
+   additional MySQL products, creates an options file, starts
+   the server, and enables you to create default user accounts.
+   For more information on choosing a package, see Section
+   2.3.2, "Choosing An Installation Package."
 
      * Binary installer distributions. There are two different
-       installable distributions that come packaged as a Microsoft
-       Windows Installer (MSI) package that you can install manually
-       or automatically on your systems. The preferred MySQL
-       Installer package includes MySQL Server and additional MySQL
-       products including MySQL Workbench, MySQL Notifier, and MySQL
-       for Excel. MySQL Installer can also be used to upgrade these
-       product in the future. The older MSI package contains all the
-       files you need to install and configure MySQL server, but no
-       additional components.
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
+       installable distributions that come packaged as a
+       Microsoft Windows Installer (MSI) package that you can
+       install manually or automatically on your systems. The
+       preferred MySQL Installer package includes MySQL Server
+       and additional MySQL products including MySQL Workbench,
+       MySQL Notifier, and MySQL for Excel. MySQL Installer can
+       also be used to upgrade these product in the future. The
+       older MSI package contains all the files you need to
+       install and configure MySQL server, but no additional
+       components.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
 
      * The standard binary distribution (packaged as a Zip file)
-       contains all of the necessary files that you unpack into your
-       chosen location. This package contains all of the files in the
-       full Windows MSI Installer package, but does not include an
-       installation program.
-       For instructions on installing MySQL using the Zip file, see
-       Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-       noinstall Zip Archive."
+       contains all of the necessary files that you unpack into
+       your chosen location. This package contains all of the
+       files in the full Windows MSI Installer package, but does
+       not include an installation program.
+       For instructions on installing MySQL using the Zip file,
+       see Section 2.3.7, "Installing MySQL on Microsoft Windows
+       Using a noinstall Zip Archive."
 
      * The source distribution format contains all the code and
-       support files for building the executables using the Visual
-       Studio compiler system.
-       For instructions on building MySQL from source on Windows, see
-       Section 2.9, "Installing MySQL from Source."
+       support files for building the executables using the
+       Visual Studio compiler system.
+       For instructions on building MySQL from source on
+       Windows, see Section 2.9, "Installing MySQL from Source."
 
    MySQL on Windows considerations:
 
      * Large Table Support
-       If you need tables with a size larger than 4GB, install MySQL
-       on an NTFS or newer file system. Do not forget to use MAX_ROWS
-       and AVG_ROW_LENGTH when you create tables. See Section
-       13.1.17, "CREATE TABLE Syntax."
+       If you need tables with a size larger than 4GB, install
+       MySQL on an NTFS or newer file system. Do not forget to
+       use MAX_ROWS and AVG_ROW_LENGTH when you create tables.
+       See Section 13.1.17, "CREATE TABLE Syntax."
 
      * MySQL and Virus Checking Software
-       Virus-scanning software such as Norton/Symantec Anti-Virus on
-       directories containing MySQL data and temporary tables can
-       cause issues, both in terms of the performance of MySQL and
-       the virus-scanning software misidentifying the contents of the
-       files as containing spam. This is due to the fingerprinting
-       mechanism used by the virus-scanning software, and the way in
-       which MySQL rapidly updates different files, which may be
-       identified as a potential security risk.
+       Virus-scanning software such as Norton/Symantec
+       Anti-Virus on directories containing MySQL data and
+       temporary tables can cause issues, both in terms of the
+       performance of MySQL and the virus-scanning software
+       misidentifying the contents of the files as containing
+       spam. This is due to the fingerprinting mechanism used by
+       the virus-scanning software, and the way in which MySQL
+       rapidly updates different files, which may be identified
+       as a potential security risk.
        After installing MySQL Server, it is recommended that you
-       disable virus scanning on the main directory (datadir) used to
-       store your MySQL table data. There is usually a system built
-       into the virus-scanning software to enable specific
-       directories to be ignored.
-       In addition, by default, MySQL creates temporary files in the
-       standard Windows temporary directory. To prevent the temporary
-       files also being scanned, configure a separate temporary
-       directory for MySQL temporary files and add this directory to
-       the virus scanning exclusion list. To do this, add a
-       configuration option for the tmpdir parameter to your my.ini
-       configuration file. For more information, see Section 2.3.7.2,
-       "Creating an Option File."
+       disable virus scanning on the main directory (datadir)
+       used to store your MySQL table data. There is usually a
+       system built into the virus-scanning software to enable
+       specific directories to be ignored.
+       In addition, by default, MySQL creates temporary files in
+       the standard Windows temporary directory. To prevent the
+       temporary files also being scanned, configure a separate
+       temporary directory for MySQL temporary files and add
+       this directory to the virus scanning exclusion list. To
+       do this, add a configuration option for the tmpdir
+       parameter to your my.ini configuration file. For more
+       information, see Section 2.3.7.2, "Creating an Option
+       File."
 
 2.3.1 MySQL Installation Layout on Microsoft Windows
 
-   For MySQL 5.5 on Windows, the default installation directory is
-   C:\Program Files\MySQL\MySQL Server 5.5. Some Windows users prefer
-   to install in C:\mysql, the directory that formerly was used as
-   the default. However, the layout of the subdirectories remains the
-   same.
+   For MySQL 5.5 on Windows, the default installation directory
+   is C:\Program Files\MySQL\MySQL Server 5.5. Some Windows
+   users prefer to install in C:\mysql, the directory that
+   formerly was used as the default. However, the layout of the
+   subdirectories remains the same.
 
-   All of the files are located within this parent directory, using
-   the structure shown in the following table.
+   All of the files are located within this parent directory,
+   using the structure shown in the following table.
 
-   Table 2.4 Default MySQL Installation Layout for Microsoft Windows
+   Table 2.4 Default MySQL Installation Layout for Microsoft
+   Windows
    Directory Contents of Directory Notes
    bin Client programs and the mysqld server
-   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files, databases
-   (Windows XP, Windows Server 2003) The Windows system variable
-   %ALLUSERSPROFILE% defaults to C:\Documents and Settings\All
-   Users\Application Data
-   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases (Vista,
-   Windows 7, Windows Server 2008, and newer) The Windows system
-   variable %PROGRAMDATA% defaults to C:\ProgramData
+   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files,
+   databases (Windows XP, Windows Server 2003) The Windows
+   system variable %ALLUSERSPROFILE% defaults to C:\Documents
+   and Settings\All Users\Application Data
+   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases
+   (Vista, Windows 7, Windows Server 2008, and newer) The
+   Windows system variable %PROGRAMDATA% defaults to
+   C:\ProgramData
    examples Example programs and scripts
    include Include (header) files
    lib Libraries
    scripts Utility scripts
    share Miscellaneous support files, including error messages,
-   character set files, sample configuration files, SQL for database
-   installation
+   character set files, sample configuration files, SQL for
+   database installation
 
-   If you install MySQL using a Windows MSI package, this package
-   creates and sets up the data directory that the installed server
-   will use, but as of MySQL 5.5.5, it also creates a pristine
-   "template" data directory named data under the installation
-   directory. This directory can be useful when the machine will be
-   used to run multiple instances of MySQL: After an installation has
-   been performed using an MSI package, the template data directory
-   can be copied to set up additional MySQL instances. See Section
-   5.3, "Running Multiple MySQL Instances on One Machine."
+   If you install MySQL using a Windows MSI package, this
+   package creates and sets up the data directory that the
+   installed server will use, but as of MySQL 5.5.5, it also
+   creates a pristine "template" data directory named data under
+   the installation directory. This directory can be useful when
+   the machine will be used to run multiple instances of MySQL:
+   After an installation has been performed using an MSI
+   package, the template data directory can be copied to set up
+   additional MySQL instances. See Section 5.3, "Running
+   Multiple MySQL Instances on One Machine."
 
 2.3.2 Choosing An Installation Package
 
-   For MySQL 5.5, there are installation package formats to choose
-   from when installing MySQL on Windows:
+   For MySQL 5.5, there are installation package formats to
+   choose from when installing MySQL on Windows:
    Note
 
-   MySQL Installer and the "Complete Package" methods for installing
-   MySQL are similar, but different. The MySQL Installer is the newer
-   and more advanced option, and it includes all functionality found
-   within the "Complete Package."
+   MySQL Installer and the "Complete Package" methods for
+   installing MySQL are similar, but different. The MySQL
+   Installer is the newer and more advanced option, and it
+   includes all functionality found within the "Complete
+   Package."
 
      * MySQL Installer: This package has a file name similar to
-       mysql-installer-community-5.5.41.0.msi or
-       mysql-installer-commercial-5.5.41.0.msi, and utilizes MSIs to
-       automatically install MySQL server and other products. It will
-       download and apply updates to itself, and for each of the
-       installed products. It also configures the additional
-       non-server products.
-       The installed products are configurable, and this includes:
-       documentation with samples and examples, connectors (such as
-       C, C++, J, NET, and ODBC), MySQL Workbench, MySQL Notifier,
-       MySQL for Excel, and the MySQL Server with its components.
-       MySQL Installer will run on all Windows platforms that are
-       supported by MySQL (see
-       http://www.mysql.com/support/supportedplatforms/database.html)
-       .
+       mysql-installer-community-5.5.42.0.msi or
+       mysql-installer-commercial-5.5.42.0.msi, and utilizes
+       MSIs to automatically install MySQL server and other
+       products. It will download and apply updates to itself,
+       and for each of the installed products. It also
+       configures the additional non-server products.
+       The installed products are configurable, and this
+       includes: documentation with samples and examples,
+       connectors (such as C, C++, J, NET, and ODBC), MySQL
+       Workbench, MySQL Notifier, MySQL for Excel, and the MySQL
+       Server with its components.
+       MySQL Installer will run on all Windows platforms that
+       are supported by MySQL (see
+       http://www.mysql.com/support/supportedplatforms/database.
+       html).
        Note
-       Because MySQL Installer is not a native component of Microsoft
-       Windows and depends on .NET, it will not work on minimal
-       installation options like the "Server Core" version of Windows
-       Server 2008.
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
-
-     * The Complete Package: This package has a file name similar to
-       mysql-5.5.41-win32.msi and contains all files needed for a
-       complete Windows installation, including the Configuration
-       Wizard. This package includes optional components such as the
-       embedded server and benchmark suite.
-
-     * The Noinstall Archive: This package has a file name similar to
-       mysql-5.5.41-win32.zip and contains all the files found in the
-       Complete install package, with the exception of the
-       Configuration Wizard. This package does not include an
-       automated installer, and must be manually installed and
-       configured.
-
-   MySQL Installer is recommended for most users. Both MySQL
-   Installer and the alternative "Complete distribution" versions are
-   available as .msi files for use with installations on Windows. The
-   Noinstall distribution is packaged as a Zip archive. To use a Zip
-   archive, you must have a tool that can unpack .zip files.
-
-   Your choice of install package affects the installation process
-   you must follow. If you choose to install using MySQL Installer,
-   see Section 2.3.3, "Installing MySQL on Microsoft Windows Using
-   MySQL Installer." If you choose to install a standard MSI package,
-   see Section 2.3.5, "Installing MySQL on Microsoft Windows Using an
-   MSI Package." If you choose to install a Noinstall archive, see
-   Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-   noinstall Zip Archive."
+       Because MySQL Installer is not a native component of
+       Microsoft Windows and depends on .NET, it will not work
+       on minimal installation options like the "Server Core"
+       version of Windows Server 2008.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+
+     * The Complete Package: This package has a file name
+       similar to mysql-5.5.42-win32.msi or
+       mysql-5.5.42-winx64.zip, and contains all files needed
+       for a complete Windows installation, including the
+       Configuration Wizard. This package includes optional
+       components such as the embedded server and benchmark
+       suite.
+
+     * The Noinstall Archive: This package has a file name
+       similar to mysql-5.5.42-win32.zip or
+       mysql-5.5.42-winx64.zip, and contains all the files found
+       in the Complete install package, with the exception of
+       the GUI. This package does not include an automated
+       installer, and must be manually installed and configured.
+
+   MySQL Installer is recommended for most users.
+
+   Your choice of install package affects the installation
+   process you must follow. If you choose to use MySQL
+   Installer, see Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer." If you choose to install a
+   standard MSI package, see Section 2.3.5, "Installing MySQL on
+   Microsoft Windows Using an MSI Package." If you choose to
+   install a Noinstall archive, see Section 2.3.7, "Installing
+   MySQL on Microsoft Windows Using a noinstall Zip Archive."
 
 2.3.3 Installing MySQL on Microsoft Windows Using MySQL Installer
 
-   MySQL Installer is an application that simplifies the installation
-   and updating process for a wide range of MySQL products, including
-   MySQL Notifier, MySQL Workbench, and MySQL for Excel
-   (http://dev.mysql.com/doc/mysql-for-excel/en/index.html). From
-   this central application, you can see which MySQL products are
-   already installed, configure them, and update or remove them if
-   necessary. The installer can also install plugins, documentation,
-   tutorials, and example databases. The MySQL Installer is only
-   available for Microsoft Windows, and includes both a GUI and
-   command-line interface.
+   MySQL Installer simplifies the installation and updating
+   process for your MySQL products on Microsoft Windows. From
+   this central application, you can view, remove, update, and
+   reconfigure the existing MySQL products on your system. MySQL
+   Installer can also install plugins, documentation, tutorials,
+   and example databases. The MySQL Installer is only available
+   for Microsoft Windows, and includes both GUI and command-line
+   interfaces.
+
+   The supported products include:
+
+     * MySQL server (http://dev.mysql.com/doc/) (one or multiple
+       versions)
+
+     * MySQL Workbench
+
+     * MySQL Connectors
+       (http://dev.mysql.com/doc/index-connectors.html) (.Net /
+       Python / ODBC / Java / C / C++)
+
+     * MySQL Notifier
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html)
+
+     * MySQL for Visual Studio
+       (http://dev.mysql.com/doc/connector-net/en/connector-net-
+       visual-studio.html)
+
+     * MySQL Utilities and MySQL Fabric
+       (http://dev.mysql.com/doc/index-utils-fabric.html)
+
+     * MySQL Samples and Examples
+
+     * MySQL Documentation
+
+     * MySQL Installer is also installed and remains on the
+       system as its own application
 
 Installer package types
 
 
-     * Full: Bundles all of the MySQL products (including MySQL
-       Server). The file' size is over 160MB, and its name has the
-       form mysql-installer-community-VERSION.N.msi where VERSION is
-       the MySQL Server version number such as 5.6 and N is the
-       package number, which begins at 0.
-
-     * Web: Only contains the Installer and configuration files, and
-       it only downloads the MySQL products you choose to install.
-       The size of this file is about 2MB; the name of the file has
-       the form mysql-installer-community-web-VERSION.N.msi where
-       VERSION is the MySQL Server version number such as 5.6 and N
-       is the package number, which begins at 0.
+     * Full: Bundles all of the MySQL products (including the
+       MySQL server). The file' size is over 200MB, and its name
+       has the form mysql-installer-community-VERSION.N.msi
+       where VERSION is the MySQL Server version number such as
+       5.6 and N is the package number, which begins at 0.
+
+     * Web: Only contains the Installer and configuration files,
+       and it only downloads the MySQL products you choose to
+       install. The size of this file is about 2MB; the name of
+       the file has the form
+       mysql-installer-community-web-VERSION.N.msi where VERSION
+       is the MySQL Server version number such as 5.6 and N is
+       the package number, which begins at 0.
 
 Installer editions
 
 
      * Community edition: Downloadable at
-       http://dev.mysql.com/downloads/installer/. It installs the
-       community edition of all MySQL products.
+       http://dev.mysql.com/downloads/installer/. It installs
+       the community edition of all MySQL products.
 
-     * Commercial edition: Downloadable at either My Oracle Support
-       (https://support.oracle.com/) (MOS) or
+     * Commercial edition: Downloadable at either My Oracle
+       Support (https://support.oracle.com/) (MOS) or
        https://edelivery.oracle.com/. It installs the commercial
-       version of all MySQL products, including Workbench SE. It also
-       integrates with your MOS account, so enter in your MOS
-       credentials to automatically receive updates for your
-       commercial MySQL products.
+       version of all MySQL products, including Workbench SE/EE.
+       It also integrates with your MOS account.
+       Note
+       Entering your MOS credentials is optional when installing
+       bundled MySQL products, but your credentials are required
+       when choosing non-bundled MySQL products that MySQL
+       Installer must download.
 
    For notes detailing the changes in each release of MySQL
    Installer, see MySQL Installer Release Notes
    (http://dev.mysql.com/doc/relnotes/mysql-installer/en/).
 
-   MySQL Installer is compatible with pre-existing installations, and
-   adds them to its list of installed components. While the MySQL
-   Installer is bundled with a specific version of MySQL Server, a
-   single MySQL Installer instance can install and manage multiple
-   MySQL Server versions. For example, a single MySQL Installer
-   instance can install versions 5.1, 5.5, and 5.6. It can also
-   manage either commercial or community editions of the MySQL
-   Server.
-   Note
-
-   A single host can not have both community and commercial editions
-   of MySQL Server installed. For example, if you want both MySQL
-   Server 5.5 and 5.6 installed on a single host, then both must be
-   the same commercial or community edition.
-
-   MySQL Installer handles the initial configuration and setup of the
-   applications. For example:
-
-    1. It will create MySQL Server connections in MySQL Workbench.
-
-    2. It creates the configuration file (my.ini) that is used to
-       configure the MySQL Server. The values written to this file
-       are influenced by choices you make during the installation
-       process.
-
-    3. It imports example databases.
-
-    4. It creates MySQL Server user accounts with configurable
-       permissions based on general roles, such as DB Administrator,
-       DB Designer, and Backup Admin. It optionally creates a Windows
-       user named MysqlSys with limited privileges, which would then
-       run the MySQL Server.
-       This feature is only available during the initial installation
-       of the MySQL Server, and not during future updates. User
-       accounts may also be added with MySQL Workbench.
-
-    5. If the "Advanced Configuration" option is checked, then the
-       Logging Options are also configured. This includes defining
-       file paths for the error log, general log, slow query log
-       (including the configuration of seconds it requires to execute
-       a query), and the binary log.
+   MySQL Installer is compatible with pre-existing
+   installations, and adds them to its list of installed
+   components. While the standard MySQL Installer is bundled
+   with a specific version of MySQL Server, a single MySQL
+   Installer instance can install and manage multiple MySQL
+   Server versions. For example, a single MySQL Installer
+   instance can install (and update) versions 5.5, 5.6, and 5.7
+   on the host.
+   Note
+
+   A single host can not have both community and commercial
+   editions of MySQL Server installed. For example, if you want
+   both MySQL Server 5.5 and 5.6 installed on a single host,
+   then both must be the same edition.
+
+   MySQL Installer handles the initial configuration and set up
+   of the applications. For example:
+
+    1. It creates initial MySQL Server connections in MySQL
+       Workbench.
+
+    2. It creates the configuration file (my.ini) that is used
+       to configure the MySQL Server. The values written to this
+       file are influenced by choices you make during the
+       installation process.
 
-   MySQL Installer can optionally check for updated components and
-   download them for you automatically.
+    3. It can optionally import example databases.
+
+    4. It can optionally create MySQL Server user accounts with
+       configurable permissions based on general roles, such as
+       DB Administrator, DB Designer, and Backup Admin. It
+       optionally creates a Windows user named MysqlSys with
+       limited privileges, which would then run the MySQL
+       Server.
+       User accounts may also be added and configured in MySQL
+       Workbench.
+
+    5. If the "Advanced Configuration" option is checked, then
+       the Logging Options are also configured. This includes
+       defining file paths for the error log, general log, slow
+       query log (including the configuration of seconds it
+       requires to execute a query), and the binary log.
+
+   MySQL Installer can optionally check for updated components
+   and download them for you.
 
 2.3.3.1 MySQL Installer GUI
 
-   After installation of the GUI version, the installer will have add
-   its own Start Menu item under MySQL.
+   Installing MySQL Installer adds a link to the Start menu
+   under the MySQL group. Click Start, All Programs MySQL, MySQL
+   Installer to reload the MySQL Installer GUI.
+   Note
+
+   Files that are generated by MySQL Installer grant full
+   permissions to the user that executes MySQL Installer,
+   including my.ini. This does not apply to files and
+   directories for specific products such as the MySQL Server
+   data directory in %ProgramData% that is owned by SYSTEM.
+
+   The initial execution of MySQL Installer requires you to
+   accept the license agreement before installing MySQL
+   products.
+
+   Figure 2.7 MySQL Installer - License Agreement
+   MySQL Installer - License Agreement
+
+Installing New Packages
+
+   Choose the appropriate Setup Type for your system. The
+   selected type determines which MySQL products are installed
+   on your system, or select Custom to manually choose
+   individual products.
+
+     * Developer: Install all products needed to develop
+       applications with MySQL. This is the default option.
+
+     * Server only: Only install the MySQL server.
+
+     * Client only: Only install the MySQL client products,
+       which does not include the MySQL server.
+
+     * Full: Install all MySQL products.
+
+     * Custom: Manually select the MySQL products to install.
+       Note
+       After the initial installation, you may use MySQL
+       Installer to manually select MySQL products to install or
+       remove. In other words, MySQL Installer becomes a MySQL
+       product management system.
+
+   Figure 2.8 MySQL Installer - Choosing a Setup Type
+   MySQL Installer - Choosing a Setup Type
+
+   After you select a setup type, the MySQL Installer will check
+   your system for the necessary external requirements for each
+   of the selected MySQL products. MySQL Installer will either
+   download and install the missing components onto your system,
+   or point you to the download location and set Status to
+   "Manual".
+
+   The next window lists the MySQL products that are scheduled
+   to be installed:
+
+   Figure 2.9 MySQL Installer - Installation Progress
+   MySQL Installer - Installation Progress
+
+   As components are installed, their Status changes from a
+   progress percentage to "Complete".
+
+   After all components are installed, the next step configures
+   some of the recently installed MySQL products. The
+   Configuration Overview window displays the progress and then
+   loads a configuration window, if required. Our example
+   configures MySQL Server 5.6.x.
+
+Configuring MySQL Server
+
+   Configuring the MySQL server begins with defining several
+   Type and Networking options.
+
+   Figure 2.10 MySQL Installer - Configuration Overview
+   MySQL Installer - Configuration Overview
+
+   Server Configuration Type
+
+   Choose the MySQL server configuration type that describes
+   your setup. This setting defines the amount of system
+   resources that will be assigned to your MySQL server
+   instance.
+
+     * Developer: A machine that will host many other
+       applications, and typically this is your personal
+       workstation. This option configures MySQL to use the
+       least amount of memory.
+
+     * Server: Several other applications will be running on
+       this machine, such as a web server. This option
+       configures MySQL to use a medium amount of memory.
+
+     * Dedicated: A machine that is dedicated to running the
+       MySQL server. Because no other major applications are
+       running on the server, such as web servers, this option
+       configures MySQL to use all available memory.
+
+   Connectivity
+
+   Connectivity options control how you will connect to MySQL.
+   Options include:
+
+     * TCP/IP: You may enable TCP/IP Networking here as
+       otherwise only localhost connections are allowed. Also
+       define the Port Number and whether to open the firewall
+       port for network access.
+
+     * Named Pipe: Enable and define the pipe name, similar to
+       using the --enable-named-pipe option.
+
+     * Shared Memory: Enable and then define the memory name,
+       similar to using the --shared-memory option.
+
+   Advanced Configuration
+
+   Checking the "Advanced Configuration" option provides
+   additional Logging Options to configure. This includes
+   defining file paths for the error log, general log, slow
+   query log (including the configuration of seconds it requires
+   to execute a query), and the binary log.
+
+   Figure 2.11 MySQL Installer - MySQL Server Configuration:
+   Type and Networking
+   MySQL Installer- MySQL Server Configuration: Type and
+   Networking
+
+Accounts and Roles
+
+   Next, define your MySQL account information. Assigning a root
+   password is required.
+
+   Optionally, you can add additional MySQL user accounts with
+   predefined user roles. Each predefined role, such as "DB
+   Admin", are configured with their own set of privileges. For
+   example, the "DB Admin" role has more privileges than the "DB
+   Designer" role. Click the Role dropdown for a list of role
+   descriptions.
    Note
 
-   Files that are generated by MySQL Installer grant full permissions
-   to the user that executes MySQL Installer, including my.ini. This
-   does not apply to files and directories for specific products such
-   as the MySQL Server data directory in ProgramData, that is owned
-   by SYSTEM.
+   If the MySQL Server is already installed, then you must also
+   enter the Current Root Password.
 
-   After the installer itself has been installed and started, the
-   following screen is displayed:
+   Figure 2.12 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles
 
-   Figure 2.7 MySQL Installer - Welcome Screen
-   MySQL Installer - Welcome Screen
+   Figure 2.13 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles: Adding a User
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles: Adding a User
 
-   There are three main options:
+Windows Service
 
-    1. Install MySQL Products - The Installation Wizard.
+   Next, configure the Windows Service details. This includes
+   the service name, whether the MySQL Server should be loaded
+   at startup, and how the Windows Service for MySQL Server is
+   executed.
 
-    2. About MySQL - Learn about MySQL products and features.
+   Figure 2.14 MySQL Installer - MySQL Server Configuration:
+   Windows Service
+   MySQL Installer - MySQL Server Configuration: Windows Service
+   Note
 
-    3. Resources - Information to help install and configure MySQL.
+   When configuring Run Windows Services as ... using a Custom
+   User, the custom user must have privileges to log on to
+   Microsoft Windows as a service. And the Next button will be
+   disabled until this user is configured with these user
+   rights.
 
-   To Install MySQL Products after executing MySQL Installer for the
-   first time, you must accept the license agreement before
-   proceeding with the installation process.
+   On Microsoft Windows 7, this is configured by loading the
+   Start Menu, Control Panel, Administrative Tools, Local
+   Security Policy, Local Policies, User Rights Assignment, then
+   Log On As A Service. Choose Add User or Group here to add the
+   custom user, and then OK, OK to save.
 
-   Figure 2.8 MySQL Installer - License Agreement
-   MySQL Installer - License Agreement
+Advanced Options
 
-   If you are connected to the Internet, then the Installer will
-   search for the latest MySQL components and add them to the
-   installation bundle. Click Connect to the Internet to complete
-   this step, or otherwise check the Skip checkbox and then Continue.
-
-   Figure 2.9 MySQL Installer - Find latest products
-   MySQL Installer - Find latest products
-
-   If you chose "Connect to the Internet," the next page will show
-   the progress of MySQL Installer's search for available updates.
-   When the search is complete (or if you opted to skip the search),
-   you will be taken to the Choose Setup Type page:
+   The next configuration step is available if the Advanced
+   Configuration option was checked. This section includes
+   options that are related to the MySQL log files:
 
-   Figure 2.10 MySQL Installer - Choosing a Setup Type
-   MySQL Installer - Choosing a Setup Type
+   Figure 2.15 MySQL Installer - MySQL Server Configuration:
+   Logging Options
+   MySQL Installer - MySQL Server Configuration: Logging Options
 
-   Determine the option most compatible with your preferences by
-   reading the Setup Type Description descriptions.
+   Click Next to continue on to the final page before all of the
+   requested changes are applied. This Apply Server
+   Configuration page details the configuration steps that will
+   be performed.
 
-   The Installation and Data paths are also defined here, and a
-   caution flag will notify you if the data path you define already
-   exists.
+   Figure 2.16 MySQL Installer - MySQL Server Configuration:
+   Apply Server Configuration
+   MySQL Installer - MySQL Server Configuration: Apply Server
+   Configuration
 
-   After you select a setup type, the MySQL Installer will check your
-   system for the necessary external requirements and download then
-   install missing components onto your system.
+   Click Execute to execute the configuration steps. The icon
+   for each step toggles from white to green on success, or the
+   process stops on failure. Click the Log tab to view the log.
 
-   Figure 2.11 MySQL Installer - Check Requirements
-   MySQL Installer - Check Requirements
+   After the MySQL Installer configuration process is finished,
+   MySQL Installer reloads the opening page where you can
+   execute other installation and configuration related actions.
 
-   The next window lists the MySQL products that are scheduled to be
-   installed:
+   MySQL Installer is added to the Microsoft Windows Start menu
+   under the MySQL group. Opening MySQL Installer loads its
+   dashboard where installed MySQL products are listed, and
+   other MySQL Installer actions are available:
 
-   Figure 2.12 MySQL Installer - Installation Progress
-   MySQL Installer - Installation Progress
+   Figure 2.17 MySQL Installer - Main Dashboard
+   MySQL Installer - Main Dashboard
 
-   As components are installed, you'll see their status change from
-   "to be installed" to "install success."
+Adding MySQL Products
 
-   Figure 2.13 MySQL Installer - Installation Progress status
-   MySQL Installer - Installation Progress status
+   Click Add to add new products. This loads the Select Products
+   and Features page:
 
-   After all components are installed, the next step involves
-   configuring the products. The Configuration Overview window
-   displays the progress and then loads a configuration window if it
-   is required.
+   Figure 2.18 MySQL Installer - Select Products and Features
+   MySQL Installer - Select Products and Features
 
-   Figure 2.14 MySQL Installer - Configuration Overview
-   MySQL Installer - Configuration Overview
+   From here, choose the MySQL products you want to install from
+   the left Available Products pane, and then click the green
+   right arrow to queue products for installation.
 
-   The ideal MySQL Server configuration depends on your intended use,
-   as explained in the next window. Choose the description that most
-   closely applies to your machine.
+   Optionally, click Edit to open the product and features
+   search filter:
 
-   You may enable TCP/IP Networking here as otherwise only localhost
-   connections are allowed.
+   Figure 2.19 MySQL Installer - Select Products and Features
+   Filter
+   MySQL Installer - Select Products and Features Filter
 
-   Checking the "Advanced Configuration" option provides additional
-   Logging Options to configure. This includes defining file paths
-   for the error log, general log, slow query log (including the
-   configuration of seconds it requires to execute a query), and the
-   binary log.
+   For example, you might choose to include Pre-Release products
+   in your selections, such as a Beta product that has not yet
+   reached GA status.
+   Note
+
+   The ability to install Pre-Release versions of MySQL products
+   was added in MySQL Installer 1.4.0.
 
-   Figure 2.15 MySQL Installer - MySQL Server Configuration: Define
-   platform, networking, and logging options
-   MySQL Installer- MySQL Server Configuration: Define platform,
-   networking, and logging options
+   Select all of the MySQL products you want to install, then
+   click Next to continue, and then Execute to execute the
+   installation process to install all of the selected products.
 
-   Next, choose your account information. Defining a root password is
-   required, whereas it's optional to create additional users. There
-   are several different predefined user roles that each have
-   different permission levels. For example, a "DB Admin" will have
-   more privileges than a "DB Designer.".
+2.3.3.1.1 MySQL Product Catalog
 
-   Figure 2.16 MySQL Installer - MySQL Server Configuration: User
-   accounts
-   MySQL Installer - MySQL Server Configuration: User accounts
+   MySQL Installer stores a MySQL product catalog. The catalog
+   can be updated either manually or automatically, and the
+   catalog change history is also available.
    Note
 
-   If the MySQL Server is already installed, then the Current Root
-   Password will also be needed.
+   The MySQL product catalog was added in MySQL Installer 1.4.0.
+
+   Manual updates
+
+   You can update the MySQL product catalog at any time by
+   clicking Catalog on the Installer dashboard.
+
+   Figure 2.20 MySQL Installer - Open the MySQL Product Catalog
+   MySQL Installer - Open the MySQL Product Catalog
+
+   From there, click Execute to update the product catalog.
+
+   Automatic updates
+
+   You can configure MySQL Installer to automatically update the
+   MySQL product catalog once per day. To enable this feature
+   and set the update time, click the wrench icon on the
+   Installer dashboard.
+
+   The next window configures the Automatic Catalog Update.
+   Enable or disable this feature, and also set the hour.
+
+   Figure 2.21 MySQL Installer - Configure the Catalog Scheduler
+   MySQL Installer - Configure the Catalog Scheduler
+
+   This option uses the Windows Task Scheduler to schedule a
+   task named "ManifestUpdate".
+
+   Change History
+
+   MySQL Installer tracks the change history for all of the
+   MySQL products. Click Catalog from the dashboard, optionally
+   update the catalog (or, toggle the Do not update at this time
+   checkbox), click Next/Execute, and then view the change
+   history.
 
-   Next, configure the Windows Service Details. This includes the
-   service name, how the MySQL Server should be loaded at startup,
-   and how the Windows Service for MySQL Server will be run.
+   Figure 2.22 MySQL Installer - Catalog Change History
+   MySQL Installer - Catalog Change History
 
-   Figure 2.17 MySQL Installer - MySQL Server Configuration: Windows
-   service details
-   MySQL Installer - MySQL Server Configuration: Windows service
-   details
+2.3.3.1.2 Remove MySQL Products
+
+   MySQL Installer can also remove MySQL products from your
+   system. To remove a MySQL product, click Remove from the
+   Installer dashboard. This opens a window with a list of
+   installed MySQL products. Select the MySQL products you want
+   to remove (uninstall), and then click Execute to begin the
+   removal process.
    Note
 
-   When configuring Run Windows Services as ... using a Custom User,
-   the custom user must have privileges to log on to Windows as a
-   service. And the Next button will be disabled until this user is
-   given these user rights.
+   To select all MySQL products, click the [ ] checkbox to the
+   left of the Product label.
 
-   On Microsoft Windows 7, this is configured by loading the Start
-   Menu, Control Panel, Administrative Tools, Local Security Policy,
-   Local Policies, User Rights Assignment, then Log On As A Service.
-   Choose Add User or Group here to add the custom user, and then OK,
-   OK to save.
+   Figure 2.23 MySQL Installer - Removing Products: Select
+   MySQL Installer - Removing Products: Select
 
-   The final configuration step is available if the Advanced
-   Configuration option was checked, and it includes configuration
-   options related to log file names:
+   Figure 2.24 MySQL Installer - Removing Products: Executed
+   MySQL Installer - Removing Products: Executed
 
-   Figure 2.18 MySQL Installer - MySQL Server Configuration: Logging
-   options
-   MySQL Installer - MySQL Server Configuration: Logging options
+2.3.3.1.3 Alter MySQL Products
 
-   After the MySQL Installer configuration process is completed, you
-   may save the installation log, and then load MySQL Workbench if
-   the Start MySQL Workbench after Setup option is checked:
+   MySQL Installer offers several options to alter your MySQL
+   product installations.
 
-   Figure 2.19 MySQL Installer - Installation Complete
-   MySQL Installer - Installation Complete
+Upgrade
 
-   You can now open MySQL Installer from the Microsoft Windows Start
-   menu under the MySQL group, which will load the MySQL Installer
-   Maintenance Screen. This is used to add, update, and remove
-   features.
+   MySQL products with an available upgrade are highlighted on
+   the main dashboard. Products with available upgrades will
+   have an upgrade icon next to their version number.
 
-   Figure 2.20 MySQL Installer - Maintenance Screen
-   MySQL Installer - Maintenance Screen
+   Figure 2.25 MySQL Installer - Upgrade a MySQL Product
+   MySQL Installer - Upgrade a MySQL Product
    Note
 
-   An Update Screen screen is shown if MySQL Installer is used on a
-   machine with older products installed, as opposed to the
-   Maintenance Screen shown above. However, the functionality remains
-   the same.
+   Available upgrades are determined by having a current
+   catalog. For information about keeping your MySQL product
+   catalog current, see Section 2.3.3.1.1, "MySQL Product
+   Catalog."
+
+   Click Upgrade to view a list upgradable products. Our example
+   indicates that MySQL server 5.6.19 can be upgraded to version
+   5.6.20.
+
+   Figure 2.26 MySQL Installer - Select Products To Upgrade
+   MySQL Installer - Select Products To Upgrade
+
+   Select (check) the products to upgrade, and optionally click
+   the changes link to view the product's release notes in your
+   browser. Click Next to begin the upgrade process.
+
+   Figure 2.27 MySQL Installer - Apply Updates
+   MySQL Installer - Apply Updates
+
+   A MySQL server upgrade will also check and upgrade the
+   server's database. Although optional, this step is
+   recommended.
+
+   Figure 2.28 MySQL Installer - Check and Upgrade Database
+   MySQL Installer - Check and Upgrade Database
+
+   Upon completion, your upgraded products will be upgraded and
+   available to use. A MySQL server upgrade also restarts the
+   MySQL server.
+
+Reconfigure
+
+   Some MySQL products, such as the MySQL server, include a
+   Reconfigure option. It opens the same configuration options
+   that were set when the MySQL product was installed, and is
+   pre-populated with the current values.
+
+   To execute, click the Reconfigure link under the Quick Action
+   column on the main dashboard for the MySQL product that you
+   want to reconfigure.
+
+   Figure 2.29 MySQL Installer - Reconfigure a MySQL Product
+   MySQL Installer - Reconfigure a MySQL Product
+
+   In the case of the MySQL server, this opens the familiar
+   configuration wizard.
+
+   Figure 2.30 MySQL Installer - Reconfiguration Wizard
+   MySQL Installer - Reconfiguration Wizard
 
-   Add/Modify Products and Features will list all installed and
-   available MySQL products.
+Modify
 
-   Figure 2.21 MySQL Installer - Add/Modify Products and Features
-   MySQL Installer - Add/Modify Products and Features
+   Many MySQL products contain feature components that can be
+   added or removed. For example, Debug binaries and Client
+   Programs are subcomponents of the MySQL server.
 
-   The installation is now complete. MySQL Server should be running,
-   and most MySQL products installed and available for use.
+   The modify the features of a product, click Modify on the
+   main dashboard.
 
-   See also the MySQL Workbench documentation
-   (http://dev.mysql.com/doc/workbench/en/).
+   Figure 2.31 MySQL Installer - Modify Product Features
+   MySQL Installer - Modify Product Features
+
+   Click Execute to execute the modification request.
 
 2.3.3.2 MySQL Installer Console
 
-   MySQLInstallerConsole provides functionality similar to the GUI
-   version of MySQL Installer, but from the command-line. It is
-   installed when MySQL Installer is initially executed, and then
-   available within the MySQL Installer directory. Typically that is
-   in C:\Program Files (x86)\MySQL\MySQL Installer\, and the console
-   must be executed with administrative privileges.
-
-   To use, invoke the Command Prompt with administrative privileges
-   by choosing Start, Accessories, then right-click on Command Prompt
-   and choose Run as administrator. And from the command-line,
-   optionally change the directory to where MySQLInstallerConsole is
-   located:
+   MySQLInstallerConsole provides functionality similar to the
+   GUI version of MySQL Installer, but from the command-line. It
+   is installed when MySQL Installer is initially executed, and
+   then available within the MySQL Installer directory.
+   Typically that is in C:\Program Files (x86)\MySQL\MySQL
+   Installer\, and the console must be executed with
+   administrative privileges.
+
+   To use, invoke the Command Prompt with administrative
+   privileges by choosing Start, Accessories, then right-click
+   on Command Prompt and choose Run as administrator. And from
+   the command-line, optionally change the directory to where
+   MySQLInstallerConsole is located:
 C:\> cd "C:\Program Files (x86)\MySQL\MySQL Installer"
+C:\> MySQLInstallerConsole.exe help
 
-   MySQLInstallerConsole supports the following options, which are
-   specified on the command line:
+C:\Program Files (x86)\MySQL\MySQL Installer for Windows>MySQLInstalle
+rConsole.exe help
 
-     * --help, -h, or -?
-       Displays a help message with usage examples, and then exits.
-C:\> MySQLInstallerConsole --help
-
-     * --updates (or -u)
-       Checks for new products before any further action is taken.
-       Disabled by default.
-
-     * --nowait
-       Skips the final pause when the program finishes. Otherwise, a
-       "Press Enter to continue." dialogue is generated. It is used
-       in conjunction with other options.
-
-     * --catalog=catalog_name (or -c)
-       Sets the default catalog. Use --list to view a list of
-       available catalogs.
-
-     * --type=installation_type (or -t)
-       Sets the installation type.
-       The possible values for installation_type are: developer,
-       server, client, full, and custom.
-
-     * --action=action_name
-       The action being performed.
-       The possible values are: install, remove, upgrade, list, and
-       status.
-
-          + install: Installs a product or products, as defined by
-            --products
-
-          + upgrade: Upgrades a product or products, as defined by
-            --products.
-
-          + remove: Removes a product or products, as defined by
-            --products.
-
-          + list: Lists the product manifest, both installed and
-            available products.
-
-          + status: Shows the status after another action is
-            performed.
-
-     * --product=product_name[:feature1],[feature2], [...] (or -p)
-       Set the feature list of a product. Use --list to view
-       available products, or pass in --product=* (an asterisk) to
-       install all available products.
-
-     * --config=product_name:passwd=root_password[;parameter1=value],
-       [;parameter2=value], ...
-       The configuration parameters for the most recently listed
-       products.
+The following commands are available:
 
-     * --user=product_name:name=username,host:hostname,role=rolename,
-       password=password or
-       --user=product_name:name=username,host:hostname,role=rolename,
-       tokens=tokens
-       Creates a new user.
-       Requires: name, host, role, and the password or tokens. Tokens
-       are separated by pipe ("|") characters.
+Configure - Configures one or more of your installed programs.
+Help      - Provides list of available commands.
+Install   - Install and configure one or more available MySQL programs
+.
+List      - Provides an interactive way to list all products available
+.
+Modify    - Modifies the features of installed products.
+Remove    - Removes one or more products from your system.
+Status    - Shows the status of all installed products.
+Update    - Update the current product catalog.
+Upgrade   - Upgrades one or more of your installed programs.
+
+   MySQLInstallerConsole supports the following options, which
+   are specified on the command line:
+
+     * configure [product1]:[setting]=[value];
+       [product2]:[setting]=[value]; [...]
+       Configure one or more MySQL products on your system.
+       Switches include:
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole configure -showsettings server
+C:\> MySQLInstallerConsole configure server:port=3307
+
+
+     * help [command]
+       Displays a help message with usage examples, and then
+       exits. Pass in an additional command to receive help
+       specific to that command.
+C:\> MySQLInstallerConsole help
+C:\> MySQLInstallerConsole help install
+
+
+     * install [product]:[features]:[config block]:[config
+       block]:[config block]; [...]
+       Install one or more MySQL products on your system.
+       Switches and syntax options include:
+
+          + -type=[SetupType] : Installs a predefined set of
+            software. The "SetupType" can be one of the
+            following:
+            Note
+            Non-custom setup types can only be chosen if no
+            other MySQL products are installed.
+               o Developer: Installs a complete development
+                 environment.
+               o Server: Installs a single MySQL server
+               o Client: Installs client programs and libraries
+               o Full: Installs everything
+               o Custom: Installs user selected products. This
+                 is the default option.
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+
+          + [config block]: One or more configuration blocks can
+            be specified. Each configuration block is a
+            semicolon separated list of key value pairs. A block
+            can include either a "config" or "user" type key,
+            where "config" is the default type if one is not
+            defined.
+            Only one "config" type block can be defined per
+            product. A "user" block should be defined for each
+            user that should be created during the product's
+            installation.
+            Note
+            Adding users is not supported when a product is
+            being reconfigured.
+
+          + [feature]: The feature block is a semicolon
+            separated list of features, or '*' to select all
+            features.
+C:\> MySQLInstallerConsole install server;5.6.22:*:port=3307;serverid=
+2:type=user;username=foo;password=bar;role=DBManager
+C:\> MySQLInstallerConsole install server;5.6.22;x64 -silent
+
+
+     * list
+       Lists an interactive console where all of the available
+       MySQL products can be searched. Execute
+       MySQLInstallerConsole list to launch the console, and
+       enter in a substring to search.
+C:\> MySQLInstallerConsole list
+
+
+     * modify [product1:-removelist|+addlist]
+       [product2:-removelist|+addlist] [...]
+       Modifies or displays features of a previously installed
+       MySQL product.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole modify server
+C:\> MySQLInstallerConsole modify server:+documentation
+C:\> MySQLInstallerConsole modify server:-debug
+
+
+     * remove [product1] [product2] [...]
+       Removes one ore more products from your system.
+
+          + * : Pass in * to remove all of the MySQL products.
+
+          + -continue : Continue the operation even if an error
+            occurs.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole remove *
+C:\> MySQLInstallerConsole remove server
+
+
+     * status
+       Provides a quick overview of the MySQL products that are
+       installed on the system. Information includes product
+       name and version, architecture, date installed, and
+       install location.
+C:\> MySQLInstallerConsole status
+
+
+     * upgrade [product1:version] [product2:version], [...]
+       Upgrades one or more products on your system. Syntax
+       options include:
+
+          + * : Pass in * to upgrade all products to the latest
+            version, or pass in specific products.
+
+          + ! : Pass in ! as a version number to upgrade the
+            MySQL product to its latest version.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole upgrade *
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2
+C:\> MySQLInstallerConsole upgrade workbench:!
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2 excel:1.3.2
+
+
+     * update
+       Downloads the latest MySQL product catalog to your
+       system. On success, the download catalog will be applied
+       the next time either MySQLInstaller or
+       MySQLInstallerConsole is executed.
+C:\> MySQLInstallerConsole update
+
+       Note
+       The Automatic Catalog Update GUI option executes this
+       command from the Windows Task Scheduler.
 
 2.3.4 MySQL Notifier
 
    The MySQL Notifier is a tool that enables you to monitor and
-   adjust the status of your local and remote MySQL Server instances
-   through an indicator that resides in the system tray. The MySQL
-   Notifier also gives quick access to several MySQL GUI tools (such
-   as MySQL Workbench) through its context menu.
+   adjust the status of your local and remote MySQL Server
+   instances through an indicator that resides in the system
+   tray. The MySQL Notifier also gives quick access to several
+   MySQL GUI tools (such as MySQL Workbench) through its context
+   menu.
 
    The MySQL Notifier is installed by MySQL Installer, and (by
    default) will start-up when Microsoft Windows is started.
    Note
 
    To install, download and execute the MySQL Installer
-   (http://dev.mysql.com/downloads/installer/), be sure the MySQL
-   Notifier product is selected, then proceed with the installation.
-   See the MySQL Installer manual for additional details.
+   (http://dev.mysql.com/downloads/installer/), be sure the
+   MySQL Notifier product is selected, then proceed with the
+   installation. See the MySQL Installer manual for additional
+   details.
 
-   For notes detailing the changes in each release of MySQL Notifier,
-   see the MySQL Notifier Release Notes
+   For notes detailing the changes in each release of MySQL
+   Notifier, see the MySQL Notifier Release Notes
    (http://dev.mysql.com/doc/relnotes/mysql-notifier/en/).
 
    Visit the MySQL Notifier forum
@@ -1576,15 +1882,16 @@ C:\> MySQLInstallerConsole --help
 
      * Start, Stop, and Restart instances of the MySQL Server.
 
-     * Automatically detects (and adds) new MySQL Server services.
-       These are listed under Manage Monitored Items, and may also be
-       configured.
-
-     * The Tray icon changes, depending on the status. It's green if
-       all monitored MySQL Server instances are running, or red if at
-       least one service is stopped. The Update MySQL Notifier tray
-       icon based on service status option, which dictates this
-       behavior, is enabled by default for each service.
+     * Automatically detects (and adds) new MySQL Server
+       services. These are listed under Manage Monitored Items,
+       and may also be configured.
+
+     * The Tray icon changes, depending on the status. It's
+       green if all monitored MySQL Server instances are
+       running, or red if at least one service is stopped. The
+       Update MySQL Notifier tray icon based on service status
+       option, which dictates this behavior, is enabled by
+       default for each service.
 
      * Links to other applications like MySQL Workbench, MySQL
        Installer, and the MySQL Utilities. For example, choosing
@@ -1592,8 +1899,8 @@ C:\> MySQLInstallerConsole --help
        Administration window for that particular instance.
 
      * If MySQL Workbench is also installed, then the Configure
-       Instance and SQL Editor options are available for local (but
-       not remote) MySQL instances.
+       Instance and SQL Editor options are available for local
+       (but not remote) MySQL instances.
 
      * Monitoring of both local and remote MySQL instances.
 
@@ -1601,108 +1908,112 @@ C:\> MySQLInstallerConsole --help
 
    Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   The MySQL Notifier resides in the system tray and provides visual
-   status information for your MySQL Server instances. A green icon
-   is displayed at the top left corner of the tray icon if the
-   current MySQL Server is running, or a red icon if the service is
-   stopped.
-
-   The MySQL Notifier automatically adds discovered MySQL Services on
-   the local machine, and each service is saved and configurable. By
-   default, the Automatically add new services whose name contains
-   option is enabled and set to mysql. Related Notifications Options
-   include being notified when new services are either discovered or
-   experience status changes, and are also enabled by default. And
-   uninstalling a service will also remove the service from the MySQL
-   Notifier.
+   The MySQL Notifier resides in the system tray and provides
+   visual status information for your MySQL Server instances. A
+   green icon is displayed at the top left corner of the tray
+   icon if the current MySQL Server is running, or a red icon if
+   the service is stopped.
+
+   The MySQL Notifier automatically adds discovered MySQL
+   Services on the local machine, and each service is saved and
+   configurable. By default, the Automatically add new services
+   whose name contains option is enabled and set to mysql.
+   Related Notifications Options include being notified when new
+   services are either discovered or experience status changes,
+   and are also enabled by default. And uninstalling a service
+   will also remove the service from the MySQL Notifier.
    Note
 
    The Automatically add new services whose name contains option
-   default changed from ".*mysqld.*" to "mysql" in Notifier 1.1.0.
+   default changed from ".*mysqld.*" to "mysql" in Notifier
+   1.1.0.
 
-   Clicking the system tray icon will reveal several options, as seen
-   in the screenshots below:
+   Clicking the system tray icon will reveal several options, as
+   seen in the screenshots below:
 
-   The Service Instance menu is the main MySQL Notifier window, and
-   enables you to Stop, Start, and Restart the MySQL Server.
+   The Service Instance menu is the main MySQL Notifier window,
+   and enables you to Stop, Start, and Restart the MySQL Server.
 
-   Figure 2.22 MySQL Notifier Service Instance menu
+   Figure 2.32 MySQL Notifier Service Instance menu
    MySQL Notifier Service Instance menu
 
-   The Actions menu includes several links to external applications
-   (if they are installed), and a Refresh Status option to manually
-   refresh the status of all monitored services (in both local and
-   remote computers) and MySQL instances.
+   The Actions menu includes several links to external
+   applications (if they are installed), and a Refresh Status
+   option to manually refresh the status of all monitored
+   services (in both local and remote computers) and MySQL
+   instances.
    Note
 
-   The main menu will not show the Actions menu when there are no
-   services being monitored by MySQL Notifier.
+   The main menu will not show the Actions menu when there are
+   no services being monitored by MySQL Notifier.
    Note
 
    The Refresh Status feature is available since MySQL Notifier
    1.1.0.
 
-   Figure 2.23 MySQL Notifier Actions menu
+   Figure 2.33 MySQL Notifier Actions menu
    MySQL Notifier Actions menu
 
-   The Actions, Options menu configures MySQL Notifier and includes
-   options to:
+   The Actions, Options menu configures MySQL Notifier and
+   includes options to:
 
-     * Use colorful status icons: Enables a colorful style of icons
-       for the tray of the MySQL Notifier.
+     * Use colorful status icons: Enables a colorful style of
+       icons for the tray of the MySQL Notifier.
 
-     * Run at Windows Startup: Allows the application to be loaded
-       when Microsoft Windows starts.
+     * Run at Windows Startup: Allows the application to be
+       loaded when Microsoft Windows starts.
 
-     * Automatically Check For Updates Every # Weeks: Checks for a
-       new version of MySQL Notifier, and runs this check every #
-       weeks.
-
-     * Automatically add new services whose name contains: The text
-       used to filter services and add them automatically to the
-       monitored list of the local computer running MySQL Notifier,
-       and on remote computers already monitoring Windows services.
-       monitored services, and also filters the list of the Microsoft
-       Windows services for the Add New Service dialog.
-       Prior to version 1.1.0, this option was named "Automatically
-       add new services that match this pattern."
-
-     * Notify me when a service is automatically added: Will display
-       a balloon notification from the taskbar when a newly
-       discovered service is added to the monitored services list.
+     * Automatically Check For Updates Every # Weeks: Checks for
+       a new version of MySQL Notifier, and runs this check
+       every # weeks.
+
+     * Automatically add new services whose name contains: The
+       text used to filter services and add them automatically
+       to the monitored list of the local computer running MySQL
+       Notifier, and on remote computers already monitoring
+       Windows services. monitored services, and also filters
+       the list of the Microsoft Windows services for the Add
+       New Service dialog.
+       Prior to version 1.1.0, this option was named
+       "Automatically add new services that match this pattern."
+
+     * Notify me when a service is automatically added: Will
+       display a balloon notification from the taskbar when a
+       newly discovered service is added to the monitored
+       services list.
 
      * Notify me when a service changes status: Will display a
-       balloon notification from the taskbar when a monitored service
-       changes its status.
+       balloon notification from the taskbar when a monitored
+       service changes its status.
 
-   Figure 2.24 MySQL Notifier Options menu
+   Figure 2.34 MySQL Notifier Options menu
    MySQL Notifier Options menu
 
-   The Actions, Manage Monitored Items menu enables you to configure
-   the monitored services and MySQL instances. First, with the
-   Services tab open:
+   The Actions, Manage Monitored Items menu enables you to
+   configure the monitored services and MySQL instances. First,
+   with the Services tab open:
 
-   Figure 2.25 MySQL Notifier Manage Services menu
+   Figure 2.35 MySQL Notifier Manage Services menu
    MySQL Notifier Manage Services menu
 
    The Instances tab is similar:
 
-   Figure 2.26 MySQL Notifier Manage Instances menu
+   Figure 2.36 MySQL Notifier Manage Instances menu
    MySQL Notifier Manage Instances menu
 
-   Adding a service or instance (after clicking Add in the Manage
-   Monitored Items window) enables you to select a running Microsoft
-   Windows service or instance connection, and configure MySQL
-   Notifier to monitor it. Add a new service or instance by clicking
-   service name from the list, then OK to accept. Multiple services
-   and instances may be selected.
+   Adding a service or instance (after clicking Add in the
+   Manage Monitored Items window) enables you to select a
+   running Microsoft Windows service or instance connection, and
+   configure MySQL Notifier to monitor it. Add a new service or
+   instance by clicking service name from the list, then OK to
+   accept. Multiple services and instances may be selected.
 
-   Figure 2.27 MySQL Notifier Adding new services
+   Figure 2.37 MySQL Notifier Adding new services
    MySQL Notifier Adding new services
 
    And instances:
 
-   Figure 2.28 MySQL Notifier Adding new instances
+   Figure 2.38 MySQL Notifier Adding new instances
    MySQL Notifier Adding new instances
    Note
 
@@ -1710,334 +2021,359 @@ C:\> MySQLInstallerConsole --help
 
 2.3.4.1 Remote monitoring set up and installation instructions
 
-   The MySQL Notifier uses Windows Management Instrumentation (WMI)
-   to manage and monitor services in remote computers running Windows
-   XP or later. This guide explains how it works, and how to set up
-   your system to monitor remote MySQL instances.
+   The MySQL Notifier uses Windows Management Instrumentation
+   (WMI) to manage and monitor services in remote computers
+   running Windows XP or later. This guide explains how it
+   works, and how to set up your system to monitor remote MySQL
+   instances.
    Note
 
    Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   In order to configure WMI, it is important to understand that the
-   underlying Distributed Component Object Model (DCOM) architecture
-   is doing the WMI work. Specifically, MySQL Notifier is using
-   asynchronous notification queries on remote Microsoft Windows
-   hosts as .NET events. These events send an asynchronous callback
-   to the computer running the MySQL Notifier so it knows when a
-   service status has changed on the remote computer. Asynchronous
-   notifications offer the best performance compared to
-   semisynchronous notifications or synchronous notifications that
-   use timers.
-
-   Asynchronous notifications requires the remote computer to send a
-   callback to the client computer (thus opening a reverse
-   connection), so the Windows Firewall and DCOM settings must be
-   properly configured for the communication to function properly.
+   In order to configure WMI, it is important to understand that
+   the underlying Distributed Component Object Model (DCOM)
+   architecture is doing the WMI work. Specifically, MySQL
+   Notifier is using asynchronous notification queries on remote
+   Microsoft Windows hosts as .NET events. These events send an
+   asynchronous callback to the computer running the MySQL
+   Notifier so it knows when a service status has changed on the
+   remote computer. Asynchronous notifications offer the best
+   performance compared to semisynchronous notifications or
+   synchronous notifications that use timers.
+
+   Asynchronous notifications requires the remote computer to
+   send a callback to the client computer (thus opening a
+   reverse connection), so the Windows Firewall and DCOM
+   settings must be properly configured for the communication to
+   function properly.
 
-   Figure 2.29 MySQL Notifier Distributed Component Object Model
+   Figure 2.39 MySQL Notifier Distributed Component Object Model
    (DCOM)
    MySQL Notifier Distributed Component Object Model (DCOM)
 
-   Most of the common errors thrown by asynchronous WMI notifications
-   are related to Windows Firewall blocking the communication, or to
-   DCOM / WMI settings not being set up properly. For a list of
-   common errors with solutions, see Section 2.3.4.1, "."
-
-   The following steps are required to make WMI function. These steps
-   are divided between two machines. A single host computer that runs
-   MySQL Notifier (Computer A), and multiple remote machines that are
-   being monitored (Computer B).
+   Most of the common errors thrown by asynchronous WMI
+   notifications are related to Windows Firewall blocking the
+   communication, or to DCOM / WMI settings not being set up
+   properly. For a list of common errors with solutions, see
+   Section 2.3.4.1, "."
+
+   The following steps are required to make WMI function. These
+   steps are divided between two machines. A single host
+   computer that runs MySQL Notifier (Computer A), and multiple
+   remote machines that are being monitored (Computer B).
 
 Computer running MySQL Notifier (Computer A)
 
 
-    1. Allow for remote administration by either editing the Group
-       Policy Editor, or using NETSH:
+    1. Allow for remote administration by either editing the
+       Group Policy Editor, or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
+
     2. Open the DCOM port TCP 135:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator) .
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator) .
          b. Execute the following command:
 NETSH firewall add portopening protocol=tcp port=135 name=DCOM_TCP135
 
-    3. Add the client application which contains the sink for the
-       callback (MySqlNotifier.exe) to the Windows Firewall
-       Exceptions List (use either the Windows Firewall configuration
-       or NETSH):
+
+    3. Add the client application which contains the sink for
+       the callback (MySqlNotifier.exe) to the Windows Firewall
+       Exceptions List (use either the Windows Firewall
+       configuration or NETSH):
        Using the Windows Firewall configuration:
          a. In the Control Panel, double-click Windows Firewall.
-         b. In the Windows Firewall window's left panel, click Allow
-            a program or feature through Windows Firewall.
-         c. In the Allowed Programs window, click Change Settings.
+         b. In the Windows Firewall window's left panel, click
+            Allow a program or feature through Windows Firewall.
+         c. In the Allowed Programs window, click Change
+            Settings.
          d. If MySqlNotifier.exe is in the Allowed programs and
-            features list, make sure it is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+            features list, make sure it is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
          e. If MySqlNotifier.exe is not in the list, click Allow
             another program....
-         f. In the Add a Program window, select the MySqlNotifier.exe
-            if it exists in the Programs list, otherwise click
-            Browse... and go to the directory where MySqlNotifier.exe
-            was installed to select it, then click Add.
-         g. Make sure MySqlNotifier.exe is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+         f. In the Add a Program window, select the
+            MySqlNotifier.exe if it exists in the Programs list,
+            otherwise click Browse... and go to the directory
+            where MySqlNotifier.exe was installed to select it,
+            then click Add.
+         g. Make sure MySqlNotifier.exe is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command, where you change
             "[YOUR_INSTALL_DIRECTORY]":
-NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\My
-SqlNotifier.exe name=MySqlNotifier
+NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\MyS
+qlNotifier.exe name=MySqlNotifier
+
 
     4. If Computer B is either a member of WORKGROUP or is in a
-       different domain that is untrusted by Computer A, then the
-       callback connection (Connection 2) is created as an Anonymous
-       connection. To grant Anonymous connections DCOM Remote Access
-       permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+       different domain that is untrusted by Computer A, then
+       the callback connection (Connection 2) is created as an
+       Anonymous connection. To grant Anonymous connections DCOM
+       Remote Access permissions:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
 Monitored Remote Computer (Computer B)
 
-   If the user account that is logged into the computer running the
-   MySQL Notifier (Computer A) is a local administrator on the remote
-   computer (Computer B), such that the same account is an
-   administrator on Computer B, you can skip to the "Allow for remote
-   administration" step.
-
-   Setting DCOM security to allow a non-administrator user to access
-   a computer remotely:
-
-    1. Grant "DCOM remote launch" and activation permissions for a
-       user or group:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+   If the user account that is logged into the computer running
+   the MySQL Notifier (Computer A) is a local administrator on
+   the remote computer (Computer B), such that the same account
+   is an administrator on Computer B, you can skip to the "Allow
+   for remote administration" step.
+
+   Setting DCOM security to allow a non-administrator user to
+   access a computer remotely:
+
+    1. Grant "DCOM remote launch" and activation permissions for
+       a user or group:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Launch Permission dialog box, follow these steps
-            if your name or your group does not appear in the Groups
-            or user names list:
+         e. In the Launch Permission dialog box, follow these
+            steps if your name or your group does not appear in
+            the Groups or user names list:
               i. In the Launch Permission dialog box, click Add.
-             ii. In the Select Users, Computers, or Groups dialog
-                 box, add your name and the group in the "Enter the
-                 object names to select" box, and then click OK.
-         f. In the Launch Permission dialog box, select your user and
-            group in the Group or user names box. In the Allow column
-            under Permissions for User, select Remote Launch, select
-            Remote Activation, and then click OK.
+             ii. In the Select Users, Computers, or Groups
+                 dialog box, add your name and the group in the
+                 "Enter the object names to select" box, and
+                 then click OK.
+         f. In the Launch Permission dialog box, select your
+            user and group in the Group or user names box. In
+            the Allow column under Permissions for User, select
+            Remote Launch, select Remote Activation, and then
+            click OK.
        Grant DCOM remote access permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
     2. Allowing non-administrator users access to a specific WMI
        namespace:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
-         c. In the Computer Management window, expand the Services
-            and Applications tree and double-click the WMI Control.
-         d. Right-click the WMI Control icon and select Properties.
-         e. In the WMI Control Properties window, click the Security
-            tab.
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
+         c. In the Computer Management window, expand the
+            Services and Applications tree and double-click the
+            WMI Control.
+         d. Right-click the WMI Control icon and select
+            Properties.
+         e. In the WMI Control Properties window, click the
+            Security tab.
          f. In the Security tab, select the namespace and click
             Security.
-         g. Locate the appropriate account and check Remote Enable in
-            the Permissions list.
+         g. Locate the appropriate account and check Remote
+            Enable in the Permissions list.
 
-    3. Allow for remote administration by either editing the Group
-       Policy Editor or using NETSH:
+    3. Allow for remote administration by either editing the
+       Group Policy Editor or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
-    4. Now, be sure the user you are logging in with uses the Name
-       value and not the Full Name value:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
+
+    4. Now, be sure the user you are logging in with uses the
+       Name value and not the Full Name value:
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
          c. In the Computer Management window, expand the System
             Tools then Local Users and Groups.
-         d. Click the Users node, and on the right side panel locate
-            your user and make sure it uses the Name value to
-            connect, and not the Full Name value.
-
-    5. If the remote computer is running on Windows XP Professional,
-       make sure that remote logins are not being forcefully changed
-       to the guest account user (also known as ForceGuest), which is
-       enabled by default on computers that are not attached to a
-       domain.
-         a. Click Start, click Run, type SECPOL.MSC, and then click
-            OK.
+         d. Click the Users node, and on the right side panel
+            locate your user and make sure it uses the Name
+            value to connect, and not the Full Name value.
+
+    5. If the remote computer is running on Windows XP
+       Professional, make sure that remote logins are not being
+       forcefully changed to the guest account user (also known
+       as ForceGuest), which is enabled by default on computers
+       that are not attached to a domain.
+         a. Click Start, click Run, type SECPOL.MSC, and then
+            click OK.
          b. Under the Local Policies node, double-click Security
             Options.
-         c. Select Network Access: Sharing and security model for
-            local accounts and save.
+         c. Select Network Access: Sharing and security model
+            for local accounts and save.
 
 Common Errors
 
 
      * 0x80070005
 
-          + DCOM Security was not configured properly (see Computer
-            B, the Setting DCOM security... step).
+          + DCOM Security was not configured properly (see
+            Computer B, the Setting DCOM security... step).
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x8007000E
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x80041003
 
-          + Access to the remote WMI namespace was not configured
-            properly (see Computer B, the Allowing non-administrator
-            users access to a specific WMI namespace step).
+          + Access to the remote WMI namespace was not
+            configured properly (see Computer B, the Allowing
+            non-administrator users access to a specific WMI
+            namespace step).
 
      * 0x800706BA
 
           + The DCOM port is not open on the client computers
-            (Computer A) firewall. See the Open the DCOM port TCP 135
-            step for Computer A.
+            (Computer A) firewall. See the Open the DCOM port
+            TCP 135 step for Computer A.
 
-          + The remote computer (Computer B) is inaccessible because
-            its network location is set to Public. Make sure you can
-            access it through the Windows Explorer.
+          + The remote computer (Computer B) is inaccessible
+            because its network location is set to Public. Make
+            sure you can access it through the Windows Explorer.
 
 2.3.5 Installing MySQL on Microsoft Windows Using an MSI Package
 
-   The MSI package is designed to install and configure MySQL in such
-   a way that you can immediately get started using MySQL.
+   The MSI package is designed to install and configure MySQL in
+   such a way that you can immediately get started using MySQL.
 
-   The MySQL Installation Wizard and MySQL Configuration Wizard are
-   available in the Complete install package, which is recommended
-   for most standard MySQL installations. Exceptions include users
-   who need to install multiple instances of MySQL on a single server
-   host and advanced users who want complete control of server
-   configuration.
+   The MySQL Installation Wizard and MySQL Configuration Wizard
+   are available in the Complete install package, which is
+   recommended for most standard MySQL installations. Exceptions
+   include users who need to install multiple instances of MySQL
+   on a single server host and advanced users who want complete
+   control of server configuration.
 
      * For information on installing using the GUI MSI installer
-       process, see Section 2.3.5.1, "Using the MySQL Installation
-       Wizard."
+       process, see Section 2.3.5.1, "Using the MySQL
+       Installation Wizard."
 
-     * For information on installing using the command line using the
-       MSI package, see Section 2.3.5.2, "Automating MySQL
-       Installation on Microsoft Windows Using the MSI Package."
-
-     * If you have previously installed MySQL using the MSI package
-       and want to remove MySQL, see Section 2.3.5.3, "Removing MySQL
-       When Installed from the MSI Package."
+     * For information on installing using the command line
+       using the MSI package, see Section 2.3.5.2, "Automating
+       MySQL Installation on Microsoft Windows Using the MSI
+       Package."
+
+     * If you have previously installed MySQL using the MSI
+       package and want to remove MySQL, see Section 2.3.5.3,
+       "Removing MySQL When Installed from the MSI Package."
 
    The workflow sequence for using the installer is shown in the
    figure below:
 
-   Figure 2.30 Installation Workflow for Windows Using MSI Installer
+   Figure 2.40 Installation Workflow for Windows Using MSI
+   Installer
    Installation Workflow for Windows using MSI Installer
    Note
 
    Microsoft Windows XP and later include a firewall which
-   specifically blocks ports. If you plan on using MySQL through a
-   network port then you should open and create an exception for this
-   port before performing the installation. To check and if necessary
-   add an exception to the firewall settings:
+   specifically blocks ports. If you plan on using MySQL through
+   a network port then you should open and create an exception
+   for this port before performing the installation. To check
+   and if necessary add an exception to the firewall settings:
 
-    1. First ensure that you are logged in as an Administrator or a
-       user with Administrator privileges.
+    1. First ensure that you are logged in as an Administrator
+       or a user with Administrator privileges.
 
-    2. Go to the Control Panel, and double click the Windows Firewall
-       icon.
+    2. Go to the Control Panel, and double click the Windows
+       Firewall icon.
 
-    3. Choose the Allow a program through Windows Firewall option and
-       click the Add port button.
+    3. Choose the Allow a program through Windows Firewall
+       option and click the Add port button.
 
-    4. Enter MySQL into the Name text box and 3306 (or the port of
-       your choice) into the Port number text box.
+    4. Enter MySQL into the Name text box and 3306 (or the port
+       of your choice) into the Port number text box.
 
-    5. Also ensure that the TCP protocol radio button is selected.
+    5. Also ensure that the TCP protocol radio button is
+       selected.
 
-    6. If you wish, you can also limit access to the MySQL server by
-       choosing the Change scope button.
+    6. If you wish, you can also limit access to the MySQL
+       server by choosing the Change scope button.
 
     7. Confirm your choices by clicking the OK button.
 
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
    Note
 
-   When using Windows Vista or newer, you may want to disable User
-   Account Control (UAC) before performing the installation. If you
-   do not do so, then MySQL may be identified as a security risk,
-   which will mean that you need to enable MySQL. You can disable the
-   security checking by following these instructions:
+   When using Windows Vista or newer, you may want to disable
+   User Account Control (UAC) before performing the
+   installation. If you do not do so, then MySQL may be
+   identified as a security risk, which will mean that you need
+   to enable MySQL. You can disable the security checking by
+   following these instructions:
 
     1. Open Control Panel.
 
@@ -2047,199 +2383,213 @@ Common Errors
     3. Click the Got to the main User Accounts page link.
 
     4. Click on Turn User Account Control on or off. You may be
-       prompted to provide permission to change this setting. Click
-       Continue.
+       prompted to provide permission to change this setting.
+       Click Continue.
 
-    5. Deselect or uncheck the check box next to Use User Account
-       Control (UAC) to help protect your computer. Click OK to save
-       the setting.
-
-   You will need to restart to complete the process. Click Restart
-   Now to reboot the machine and apply the changes. You can then
-   follow the instructions below for installing Windows.
+    5. Deselect or uncheck the check box next to Use User
+       Account Control (UAC) to help protect your computer.
+       Click OK to save the setting.
+
+   You will need to restart to complete the process. Click
+   Restart Now to reboot the machine and apply the changes. You
+   can then follow the instructions below for installing
+   Windows.
 
 2.3.5.1 Using the MySQL Installation Wizard
 
-   MySQL Installation Wizard is an installer for the MySQL server
-   that uses the latest installer technologies for Microsoft Windows.
-   The MySQL Installation Wizard, in combination with the MySQL
-   Configuration Wizard, enables a user to install and configure a
-   MySQL server that is ready for use immediately after installation.
-
-   The MySQL Installation Wizard is the standard installer for all
-   MySQL server distributions, version 4.1.5 and higher. Users of
-   previous versions of MySQL need to shut down and remove their
-   existing MySQL installations manually before installing MySQL with
-   the MySQL Installation Wizard. See Section 2.3.5.1.6, "Upgrading
-   MySQL with the Installation Wizard," for more information on
-   upgrading from a previous version.
+   MySQL Installation Wizard is an installer for the MySQL
+   server that uses the latest installer technologies for
+   Microsoft Windows. The MySQL Installation Wizard, in
+   combination with the MySQL Configuration Wizard, enables a
+   user to install and configure a MySQL server that is ready
+   for use immediately after installation.
+
+   The MySQL Installation Wizard is the standard installer for
+   all MySQL server distributions, version 4.1.5 and higher.
+   Users of previous versions of MySQL need to shut down and
+   remove their existing MySQL installations manually before
+   installing MySQL with the MySQL Installation Wizard. See
+   Section 2.3.5.1.6, "Upgrading MySQL with the Installation
+   Wizard," for more information on upgrading from a previous
+   version.
 
    Microsoft has included an improved version of their Microsoft
-   Windows Installer (MSI) in the recent versions of Windows. MSI has
-   become the de-facto standard for application installations on
-   Windows 2000, Windows XP, and Windows Server 2003. The MySQL
-   Installation Wizard makes use of this technology to provide a
-   smoother and more flexible installation process.
+   Windows Installer (MSI) in the recent versions of Windows.
+   MSI has become the de-facto standard for application
+   installations on Windows 2000, Windows XP, and Windows Server
+   2003. The MySQL Installation Wizard makes use of this
+   technology to provide a smoother and more flexible
+   installation process.
 
    The Microsoft Windows Installer Engine was updated with the
-   release of Windows XP; those using a previous version of Windows
-   can reference this Microsoft Knowledge Base article
-   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;292539)
-   for information on upgrading to the latest version of the Windows
-   Installer Engine.
-
-   In addition, Microsoft has introduced the WiX (Windows Installer
-   XML) toolkit recently. This is the first highly acknowledged Open
-   Source project from Microsoft. We have switched to WiX because it
-   is an Open Source project and it enables us to handle the complete
-   Windows installation process in a flexible manner using scripts.
-
-   Improving the MySQL Installation Wizard depends on the support and
-   feedback of users like you. If you find that the MySQL
-   Installation Wizard is lacking some feature important to you, or
-   if you discover a bug, please report it in our bugs database using
-   the instructions given in Section 1.7, "How to Report Bugs or
-   Problems."
+   release of Windows XP; those using a previous version of
+   Windows can reference this Microsoft Knowledge Base article
+   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;2925
+   39) for information on upgrading to the latest version of the
+   Windows Installer Engine.
+
+   In addition, Microsoft has introduced the WiX (Windows
+   Installer XML) toolkit recently. This is the first highly
+   acknowledged Open Source project from Microsoft. We have
+   switched to WiX because it is an Open Source project and it
+   enables us to handle the complete Windows installation
+   process in a flexible manner using scripts.
+
+   Improving the MySQL Installation Wizard depends on the
+   support and feedback of users like you. If you find that the
+   MySQL Installation Wizard is lacking some feature important
+   to you, or if you discover a bug, please report it in our
+   bugs database using the instructions given in Section 1.7,
+   "How to Report Bugs or Problems."
 
 2.3.5.1.1 Downloading and Starting the MySQL Installation Wizard
 
    The MySQL installation packages can be downloaded from
-   http://dev.mysql.com/downloads/. If the package you download is
-   contained within a Zip archive, you need to extract the archive
-   first.
-   Note
-
-   If you are installing on Windows Vista or newer, it is best to
-   open a network port before beginning the installation. To do this,
-   first ensure that you are logged in as an Administrator, go to the
-   Control Panel, and double-click the Windows Firewall icon. Choose
-   the Allow a program through Windows Firewall option and click the
-   Add port button. Enter MySQL into the Name text box and 3306 (or
-   the port of your choice) into the Port number text box. Also
-   ensure that the TCP protocol radio button is selected. If you
-   wish, you can also limit access to the MySQL server by choosing
-   the Change scope button. Confirm your choices by clicking the OK
-   button. If you do not open a port prior to installation, you
-   cannot configure the MySQL server immediately after installation.
+   http://dev.mysql.com/downloads/. If the package you download
+   is contained within a Zip archive, you need to extract the
+   archive first.
+   Note
+
+   If you are installing on Windows Vista or newer, it is best
+   to open a network port before beginning the installation. To
+   do this, first ensure that you are logged in as an
+   Administrator, go to the Control Panel, and double-click the
+   Windows Firewall icon. Choose the Allow a program through
+   Windows Firewall option and click the Add port button. Enter
+   MySQL into the Name text box and 3306 (or the port of your
+   choice) into the Port number text box. Also ensure that the
+   TCP protocol radio button is selected. If you wish, you can
+   also limit access to the MySQL server by choosing the Change
+   scope button. Confirm your choices by clicking the OK button.
+   If you do not open a port prior to installation, you cannot
+   configure the MySQL server immediately after installation.
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
 
-   The process for starting the wizard depends on the contents of the
-   installation package you download. If there is a setup.exe file
-   present, double-click it to start the installation process. If
-   there is an .msi file present, double-click it to start the
-   installation process.
+   The process for starting the wizard depends on the contents
+   of the installation package you download. If there is a
+   setup.exe file present, double-click it to start the
+   installation process. If there is an .msi file present,
+   double-click it to start the installation process.
 
 2.3.5.1.2 Choosing an Install Type
 
-   There are three installation types available: Typical, Complete,
-   and Custom.
+   There are three installation types available: Typical,
+   Complete, and Custom.
+
+   The Typical installation type installs the MySQL server, the
+   mysql command-line client, and the command-line utilities.
+   The command-line clients and utilities include mysqldump,
+   myisamchk, and several other tools to help you manage the
+   MySQL server.
 
-   The Typical installation type installs the MySQL server, the mysql
-   command-line client, and the command-line utilities. The
-   command-line clients and utilities include mysqldump, myisamchk,
-   and several other tools to help you manage the MySQL server.
-
-   The Complete installation type installs all components included in
-   the installation package. The full installation package includes
-   components such as the embedded server library, the benchmark
-   suite, support scripts, and documentation.
-
-   The Custom installation type gives you complete control over which
-   packages you wish to install and the installation path that is
-   used. See Section 2.3.5.1.3, "The Custom Install Dialog," for more
-   information on performing a custom install.
-
-   If you choose the Typical or Complete installation types and click
-   the Next button, you advance to the confirmation screen to verify
-   your choices and begin the installation. If you choose the Custom
-   installation type and click the Next button, you advance to the
-   custom installation dialog, described in Section 2.3.5.1.3, "The
-   Custom Install Dialog."
+   The Complete installation type installs all components
+   included in the installation package. The full installation
+   package includes components such as the embedded server
+   library, the benchmark suite, support scripts, and
+   documentation.
+
+   The Custom installation type gives you complete control over
+   which packages you wish to install and the installation path
+   that is used. See Section 2.3.5.1.3, "The Custom Install
+   Dialog," for more information on performing a custom install.
+
+   If you choose the Typical or Complete installation types and
+   click the Next button, you advance to the confirmation screen
+   to verify your choices and begin the installation. If you
+   choose the Custom installation type and click the Next
+   button, you advance to the custom installation dialog,
+   described in Section 2.3.5.1.3, "The Custom Install Dialog."
 
 2.3.5.1.3 The Custom Install Dialog
 
    If you wish to change the installation path or the specific
-   components that are installed by the MySQL Installation Wizard,
-   choose the Custom installation type.
+   components that are installed by the MySQL Installation
+   Wizard, choose the Custom installation type.
 
-   A tree view on the left side of the custom install dialog lists
-   all available components. Components that are not installed have a
-   red X icon; components that are installed have a gray icon. To
-   change whether a component is installed, click that component's
-   icon and choose a new option from the drop-down list that appears.
+   A tree view on the left side of the custom install dialog
+   lists all available components. Components that are not
+   installed have a red X icon; components that are installed
+   have a gray icon. To change whether a component is installed,
+   click that component's icon and choose a new option from the
+   drop-down list that appears.
 
    You can change the default installation path by clicking the
-   Change... button to the right of the displayed installation path.
+   Change... button to the right of the displayed installation
+   path.
 
-   After choosing your installation components and installation path,
-   click the Next button to advance to the confirmation dialog.
+   After choosing your installation components and installation
+   path, click the Next button to advance to the confirmation
+   dialog.
 
 2.3.5.1.4 The Confirmation Dialog
 
-   Once you choose an installation type and optionally choose your
-   installation components, you advance to the confirmation dialog.
-   Your installation type and installation path are displayed for you
-   to review.
-
-   To install MySQL if you are satisfied with your settings, click
-   the Install button. To change your settings, click the Back
-   button. To exit the MySQL Installation Wizard without installing
-   MySQL, click the Cancel button.
+   Once you choose an installation type and optionally choose
+   your installation components, you advance to the confirmation
+   dialog. Your installation type and installation path are
+   displayed for you to review.
+
+   To install MySQL if you are satisfied with your settings,
+   click the Install button. To change your settings, click the
+   Back button. To exit the MySQL Installation Wizard without
+   installing MySQL, click the Cancel button.
 
    The final screen of the installer provides a summary of the
    installation and gives you the option to launch the MySQL
-   Configuration Wizard, which you can use to create a configuration
-   file, install the MySQL service, and configure security settings.
+   Configuration Wizard, which you can use to create a
+   configuration file, install the MySQL service, and configure
+   security settings.
 
 2.3.5.1.5 Changes Made by MySQL Installation Wizard
 
-   Once you click the Install button, the MySQL Installation Wizard
-   begins the installation process and makes certain changes to your
-   system which are described in the sections that follow.
+   Once you click the Install button, the MySQL Installation
+   Wizard begins the installation process and makes certain
+   changes to your system which are described in the sections
+   that follow.
 
    Changes to the Registry
 
-   The MySQL Installation Wizard creates one Windows registry key in
-   a typical install situation, located in
+   The MySQL Installation Wizard creates one Windows registry
+   key in a typical install situation, located in
    HKEY_LOCAL_MACHINE\SOFTWARE\MySQL AB.
 
-   The MySQL Installation Wizard creates a key named after the major
-   version of the server that is being installed, such as MySQL
-   Server 5.5. It contains two string values, Location and Version.
-   The Location string contains the path to the installation
-   directory. In a default installation it contains C:\Program
-   Files\MySQL\MySQL Server 5.5\. The Version string contains the
-   release number. For example, for an installation of MySQL Server
-   5.5.41, the key contains a value of 5.5.41.
-
-   These registry keys are used to help external tools identify the
-   installed location of the MySQL server, preventing a complete scan
-   of the hard-disk to determine the installation path of the MySQL
-   server. The registry keys are not required to run the server, and
-   if you install MySQL using the noinstall Zip archive, the registry
-   keys are not created.
+   The MySQL Installation Wizard creates a key named after the
+   major version of the server that is being installed, such as
+   MySQL Server 5.5. It contains two string values, Location and
+   Version. The Location string contains the path to the
+   installation directory. In a default installation it contains
+   C:\Program Files\MySQL\MySQL Server 5.5\. The Version string
+   contains the release number. For example, for an installation
+   of MySQL Server 5.5.42, the key contains a value of 5.5.42.
+
+   These registry keys are used to help external tools identify
+   the installed location of the MySQL server, preventing a
+   complete scan of the hard-disk to determine the installation
+   path of the MySQL server. The registry keys are not required
+   to run the server, and if you install MySQL using the
+   noinstall Zip archive, the registry keys are not created.
 
    Changes to the Start Menu
 
-   The MySQL Installation Wizard creates a new entry in the Windows
-   Start menu under a common MySQL menu heading named after the major
-   version of MySQL that you have installed. For example, if you
-   install MySQL 5.5, the MySQL Installation Wizard creates a MySQL
-   Server 5.5 section in the Start menu.
+   The MySQL Installation Wizard creates a new entry in the
+   Windows Start menu under a common MySQL menu heading named
+   after the major version of MySQL that you have installed. For
+   example, if you install MySQL 5.5, the MySQL Installation
+   Wizard creates a MySQL Server 5.5 section in the Start menu.
 
    The following entries are created within the new Start menu
    section:
 
-     * MySQL Command-Line Client: This is a shortcut to the mysql
-       command-line client and is configured to connect as the root
-       user. The shortcut prompts for a root user password when you
-       connect.
-
-     * MySQL Server Instance Config Wizard: This is a shortcut to the
-       MySQL Configuration Wizard. Use this shortcut to configure a
-       newly installed server, or to reconfigure an existing server.
+     * MySQL Command-Line Client: This is a shortcut to the
+       mysql command-line client and is configured to connect as
+       the root user. The shortcut prompts for a root user
+       password when you connect.
+
+     * MySQL Server Instance Config Wizard: This is a shortcut
+       to the MySQL Configuration Wizard. Use this shortcut to
+       configure a newly installed server, or to reconfigure an
+       existing server.
 
      * MySQL Documentation: This is a link to the MySQL server
        documentation that is stored locally in the MySQL server
@@ -2247,23 +2597,23 @@ Common Errors
 
    Changes to the File System
 
-   The MySQL Installation Wizard by default installs the MySQL 5.5
-   server to C:\Program Files\MySQL\MySQL Server 5.5, where Program
-   Files is the default location for applications in your system, and
-   5.5 is the major version of your MySQL server. This is the
-   recommended location for the MySQL server, replacing the former
-   default location C:\mysql.
+   The MySQL Installation Wizard by default installs the MySQL
+   5.5 server to C:\Program Files\MySQL\MySQL Server 5.5, where
+   Program Files is the default location for applications in
+   your system, and 5.5 is the major version of your MySQL
+   server. This is the recommended location for the MySQL
+   server, replacing the former default location C:\mysql.
 
    By default, all MySQL applications are stored in a common
-   directory at C:\Program Files\MySQL, where Program Files is the
-   default location for applications in your Windows installation. A
-   typical MySQL installation on a developer machine might look like
-   this:
+   directory at C:\Program Files\MySQL, where Program Files is
+   the default location for applications in your Windows
+   installation. A typical MySQL installation on a developer
+   machine might look like this:
 C:\Program Files\MySQL\MySQL Server 5.5
 C:\Program Files\MySQL\MySQL Workbench 5.1 OSS
 
-   This approach makes it easier to manage and maintain all MySQL
-   applications installed on a particular system.
+   This approach makes it easier to manage and maintain all
+   MySQL applications installed on a particular system.
 
    The default location of the data directory is the AppData
    directory configured for the user that installed the MySQL
@@ -2272,93 +2622,97 @@ C:\Program Files\MySQL\MySQL Workbench 5
 2.3.5.1.6 Upgrading MySQL with the Installation Wizard
 
    The MySQL Installation Wizard can perform server upgrades
-   automatically using the upgrade capabilities of MSI. That means
-   you do not need to remove a previous installation manually before
-   installing a new release. The installer automatically shuts down
-   and removes the previous MySQL service before installing the new
-   version.
+   automatically using the upgrade capabilities of MSI. That
+   means you do not need to remove a previous installation
+   manually before installing a new release. The installer
+   automatically shuts down and removes the previous MySQL
+   service before installing the new version.
 
    Automatic upgrades are available only when upgrading between
-   installations that have the same major and minor version numbers.
-   For example, you can upgrade automatically from MySQL 5.5.5 to
-   MySQL 5.5.6, but not from MySQL 5.1 to MySQL 5.5.
+   installations that have the same major and minor version
+   numbers. For example, you can upgrade automatically from
+   MySQL 5.5.5 to MySQL 5.5.6, but not from MySQL 5.1 to MySQL
+   5.5.
 
    See Section 2.3.9, "Upgrading MySQL on Windows."
 
-2.3.5.2 Automating MySQL Installation on Microsoft Windows Using the
-MSI Package
+2.3.5.2 Automating MySQL Installation on Microsoft Windows Using
+the MSI Package
 
    The Microsoft Installer (MSI) supports a both a quiet and a
    passive mode that can be used to install MySQL automatically
-   without requiring intervention. You can use this either in scripts
-   to automatically install MySQL or through a terminal connection
-   such as Telnet where you do not have access to the standard
-   Windows user interface. The MSI packages can also be used in
-   combination with Microsoft's Group Policy system (part of Windows
-   Server 2003 and Windows Server 2008) to install MySQL across
-   multiple machines.
-
-   To install MySQL from one of the MSI packages automatically from
-   the command line (or within a script), you need to use the
-   msiexec.exe tool. For example, to perform a quiet installation
-   (which shows no dialog boxes or progress):
-shell> msiexec /i mysql-5.5.41.msi /quiet
-
-   The /i indicates that you want to perform an installation. The
-   /quiet option indicates that you want no interactive elements.
-
-   To provide a dialog box showing the progress during installation,
-   and the dialog boxes providing information on the installation and
-   registration of MySQL, use /passive mode instead of /quiet:
-shell> msiexec /i mysql-5.5.41.msi /passive
-
-   Regardless of the mode of the installation, installing the package
-   in this manner performs a 'Typical' installation, and installs the
-   default components into the standard location.
+   without requiring intervention. You can use this either in
+   scripts to automatically install MySQL or through a terminal
+   connection such as Telnet where you do not have access to the
+   standard Windows user interface. The MSI packages can also be
+   used in combination with Microsoft's Group Policy system
+   (part of Windows Server 2003 and Windows Server 2008) to
+   install MySQL across multiple machines.
+
+   To install MySQL from one of the MSI packages automatically
+   from the command line (or within a script), you need to use
+   the msiexec.exe tool. For example, to perform a quiet
+   installation (which shows no dialog boxes or progress):
+shell> msiexec /i mysql-5.5.42.msi /quiet
+
+   The /i indicates that you want to perform an installation.
+   The /quiet option indicates that you want no interactive
+   elements.
+
+   To provide a dialog box showing the progress during
+   installation, and the dialog boxes providing information on
+   the installation and registration of MySQL, use /passive mode
+   instead of /quiet:
+shell> msiexec /i mysql-5.5.42.msi /passive
+
+   Regardless of the mode of the installation, installing the
+   package in this manner performs a 'Typical' installation, and
+   installs the default components into the standard location.
 
    You can also use this method to uninstall MySQL by using the
    /uninstall or /x options:
-shell> msiexec /x mysql-5.5.41.msi /uninstall
+shell> msiexec /x mysql-5.5.42.msi /uninstall
 
-   To install MySQL and configure a MySQL instance from the command
-   line, see Section 2.3.6.13, "MySQL Server Instance Config Wizard:
-   Creating an Instance from the Command Line."
+   To install MySQL and configure a MySQL instance from the
+   command line, see Section 2.3.6.13, "MySQL Server Instance
+   Config Wizard: Creating an Instance from the Command Line."
 
    For information on using MSI packages to install software
-   automatically using Group Policy, see How to use Group Policy to
-   remotely install software in Windows Server 2003
+   automatically using Group Policy, see How to use Group Policy
+   to remotely install software in Windows Server 2003
    (http://support.microsoft.com/kb/816102).
 
 2.3.5.3 Removing MySQL When Installed from the MSI Package
 
-   To uninstall a MySQL where you have used the MSI packages, you
-   must use the Add/Remove Programs tool within Control Panel. To do
-   this:
+   To uninstall a MySQL where you have used the MSI packages,
+   you must use the Add/Remove Programs tool within Control
+   Panel. To do this:
 
     1. Right-click the start menu and choose Control Panel.
 
-    2. If the Control Panel is set to category mode (you will see
-       Pick a category at the top of the Control Panel window),
-       double-click Add or Remove Programs. If the Control is set to
-       classic mode, double-click the Add or Remove Programs icon.
-
-    3. Find MySQL in the list of installed software. MySQL Server is
-       installed against major version numbers (MySQL 5.1, MySQL 5.5,
-       etc.). Select the version that you want to remove and click
-       Remove.
+    2. If the Control Panel is set to category mode (you will
+       see Pick a category at the top of the Control Panel
+       window), double-click Add or Remove Programs. If the
+       Control is set to classic mode, double-click the Add or
+       Remove Programs icon.
+
+    3. Find MySQL in the list of installed software. MySQL
+       Server is installed against major version numbers (MySQL
+       5.1, MySQL 5.5, etc.). Select the version that you want
+       to remove and click Remove.
 
     4. You will be prompted to confirm the removal. Click Yes to
        remove MySQL.
 
    When MySQL is removed using this method, only the installed
-   components are removed. Any database information (including the
-   tables and data), import or export files, log files, and binary
-   logs produced during execution are kept in their configured
-   location.
-
-   If you try to install MySQL again the information will be retained
-   and you will be prompted to enter the password configured with the
-   original installation.
+   components are removed. Any database information (including
+   the tables and data), import or export files, log files, and
+   binary logs produced during execution are kept in their
+   configured location.
+
+   If you try to install MySQL again the information will be
+   retained and you will be prompted to enter the password
+   configured with the original installation.
 
    If you want to delete MySQL completely:
 
@@ -2370,84 +2724,90 @@ shell> msiexec /x mysql-5.5.41.msi /unin
      * On Windows 7 and Windows Server 2008, the default data
        directory location is C:\ProgramData\Mysql.
        Note
-       The C:\ProgramData directory is hidden by default. You must
-       change your folder options to view the hidden file. Choose
-       Organize, Folder and search options, Show hidden folders.
+       The C:\ProgramData directory is hidden by default. You
+       must change your folder options to view the hidden file.
+       Choose Organize, Folder and search options, Show hidden
+       folders.
 
 2.3.6 MySQL Server Instance Configuration Wizard
 
-   The MySQL Server Instance Configuration Wizard helps automate the
-   process of configuring your server. It creates a custom MySQL
-   configuration file (my.ini or my.cnf) by asking you a series of
-   questions and then applying your responses to a template to
-   generate the configuration file that is tuned to your
-   installation.
-
-   The MySQL Server Instance Configuration Wizard is included with
-   the MySQL 5.5 server. The MySQL Server Instance Configuration
-   Wizard is only available for Windows.
+   The MySQL Server Instance Configuration Wizard helps automate
+   the process of configuring your server. It creates a custom
+   MySQL configuration file (my.ini or my.cnf) by asking you a
+   series of questions and then applying your responses to a
+   template to generate the configuration file that is tuned to
+   your installation.
+
+   The MySQL Server Instance Configuration Wizard is included
+   with the MySQL 5.5 server. The MySQL Server Instance
+   Configuration Wizard is only available for Windows.
 
 2.3.6.1 Starting the MySQL Server Instance Configuration Wizard
 
-   The MySQL Server Instance Configuration Wizard is normally started
-   as part of the installation process. You should only need to run
-   the MySQL Server Instance Configuration Wizard again when you need
-   to change the configuration parameters of your server.
+   The MySQL Server Instance Configuration Wizard is normally
+   started as part of the installation process. You should only
+   need to run the MySQL Server Instance Configuration Wizard
+   again when you need to change the configuration parameters of
+   your server.
 
    If you chose not to open a port prior to installing MySQL on
-   Windows Vista or newer, you can choose to use the MySQL Server
-   Configuration Wizard after installation. However, you must open a
-   port in the Windows Firewall. To do this see the instructions
-   given in Section 2.3.5.1.1, "Downloading and Starting the MySQL
-   Installation Wizard." Rather than opening a port, you also have
-   the option of adding MySQL as a program that bypasses the Windows
-   Firewall. One or the other option is sufficient---you need not do
-   both. Additionally, when running the MySQL Server Configuration
-   Wizard on Windows Vista or newer, ensure that you are logged in as
-   a user with administrative rights.
+   Windows Vista or newer, you can choose to use the MySQL
+   Server Configuration Wizard after installation. However, you
+   must open a port in the Windows Firewall. To do this see the
+   instructions given in Section 2.3.5.1.1, "Downloading and
+   Starting the MySQL Installation Wizard." Rather than opening
+   a port, you also have the option of adding MySQL as a program
+   that bypasses the Windows Firewall. One or the other option
+   is sufficient---you need not do both. Additionally, when
+   running the MySQL Server Configuration Wizard on Windows
+   Vista or newer, ensure that you are logged in as a user with
+   administrative rights.
    MySQL Server Instance Configuration Wizard
 
    You can launch the MySQL Configuration Wizard by clicking the
-   MySQL Server Instance Config Wizard entry in the MySQL section of
-   the Windows Start menu.
+   MySQL Server Instance Config Wizard entry in the MySQL
+   section of the Windows Start menu.
 
-   Alternatively, you can navigate to the bin directory of your MySQL
-   installation and launch the MySQLInstanceConfig.exe file directly.
-
-   The MySQL Server Instance Configuration Wizard places the my.ini
-   file in the installation directory for the MySQL server. This
-   helps associate configuration files with particular server
-   instances.
-
-   To ensure that the MySQL server knows where to look for the my.ini
-   file, an argument similar to this is passed to the MySQL server as
-   part of the service installation:
+   Alternatively, you can navigate to the bin directory of your
+   MySQL installation and launch the MySQLInstanceConfig.exe
+   file directly.
+
+   The MySQL Server Instance Configuration Wizard places the
+   my.ini file in the installation directory for the MySQL
+   server. This helps associate configuration files with
+   particular server instances.
+
+   To ensure that the MySQL server knows where to look for the
+   my.ini file, an argument similar to this is passed to the
+   MySQL server as part of the service installation:
 --defaults-file="C:\Program Files\MySQL\MySQL Server 5.5\my.ini"
 
-   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced with the
-   installation path to the MySQL Server. The --defaults-file option
-   instructs the MySQL server to read the specified file for
-   configuration options when it starts.
-
-   Apart from making changes to the my.ini file by running the MySQL
-   Server Instance Configuration Wizard again, you can modify it by
-   opening it with a text editor and making any necessary changes.
-   You can also modify the server configuration with the
-   http://www.mysql.com/products/administrator/ utility. For more
-   information about server configuration, see Section 5.1.3, "Server
-   Command Options."
+   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced
+   with the installation path to the MySQL Server. The
+   --defaults-file option instructs the MySQL server to read the
+   specified file for configuration options when it starts.
+
+   Apart from making changes to the my.ini file by running the
+   MySQL Server Instance Configuration Wizard again, you can
+   modify it by opening it with a text editor and making any
+   necessary changes. You can also modify the server
+   configuration with the
+   http://www.mysql.com/products/administrator/ utility. For
+   more information about server configuration, see Section
+   5.1.3, "Server Command Options."
 
    MySQL clients and utilities such as the mysql and mysqldump
    command-line clients are not able to locate the my.ini file
-   located in the server installation directory. To configure the
-   client and utility applications, create a new my.ini file in the
-   Windows installation directory (for example, C:\WINDOWS).
-
-   Under Windows Server 2003, Windows Server 2000, Windows XP, and
-   Windows Vista, MySQL Server Instance Configuration Wizard will
-   configure MySQL to work as a Windows service. To start and stop
-   MySQL you use the Services application that is supplied as part of
-   the Windows Administrator Tools.
+   located in the server installation directory. To configure
+   the client and utility applications, create a new my.ini file
+   in the Windows installation directory (for example,
+   C:\WINDOWS).
+
+   Under Windows Server 2003, Windows Server 2000, Windows XP,
+   and Windows Vista, MySQL Server Instance Configuration Wizard
+   will configure MySQL to work as a Windows service. To start
+   and stop MySQL you use the Services application that is
+   supplied as part of the Windows Administrator Tools.
 
 2.3.6.2 Choosing a Maintenance Option
 
@@ -2459,118 +2819,119 @@ shell> msiexec /x mysql-5.5.41.msi /unin
 
    To reconfigure an existing server, choose the Re-configure
    Instance option and click the Next button. Any existing
-   configuration file is not overwritten, but renamed (within the
-   same directory) using a timestamp (Windows) or sequential number
-   (Linux). To remove the existing server instance, choose the Remove
-   Instance option and click the Next button.
+   configuration file is not overwritten, but renamed (within
+   the same directory) using a timestamp (Windows) or sequential
+   number (Linux). To remove the existing server instance,
+   choose the Remove Instance option and click the Next button.
 
    If you choose the Remove Instance option, you advance to a
-   confirmation window. Click the Execute button. The MySQL Server
-   Configuration Wizard stops and removes the MySQL service, and then
-   deletes the configuration file. The server installation and its
-   data folder are not removed.
-
-   If you choose the Re-configure Instance option, you advance to the
-   Configuration Type dialog where you can choose the type of
-   installation that you wish to configure.
+   confirmation window. Click the Execute button. The MySQL
+   Server Configuration Wizard stops and removes the MySQL
+   service, and then deletes the configuration file. The server
+   installation and its data folder are not removed.
+
+   If you choose the Re-configure Instance option, you advance
+   to the Configuration Type dialog where you can choose the
+   type of installation that you wish to configure.
 
 2.3.6.3 Choosing a Configuration Type
 
-   When you start the MySQL Server Instance Configuration Wizard for
-   a new MySQL installation, or choose the Re-configure Instance
-   option for an existing installation, you advance to the
-   Configuration Type dialog.
-   MySQL Server Instance Configuration Wizard: Configuration Type
+   When you start the MySQL Server Instance Configuration Wizard
+   for a new MySQL installation, or choose the Re-configure
+   Instance option for an existing installation, you advance to
+   the Configuration Type dialog.
+   MySQL Server Instance Configuration Wizard: Configuration
+   Type
 
    There are two configuration types available: Detailed
    Configuration and Standard Configuration. The Standard
-   Configuration option is intended for new users who want to get
-   started with MySQL quickly without having to make many decisions
-   about server configuration. The Detailed Configuration option is
-   intended for advanced users who want more fine-grained control
-   over server configuration.
+   Configuration option is intended for new users who want to
+   get started with MySQL quickly without having to make many
+   decisions about server configuration. The Detailed
+   Configuration option is intended for advanced users who want
+   more fine-grained control over server configuration.
 
    If you are new to MySQL and need a server configured as a
-   single-user developer machine, the Standard Configuration should
-   suit your needs. Choosing the Standard Configuration option causes
-   the MySQL Configuration Wizard to set all configuration options
-   automatically with the exception of Service Options and Security
-   Options.
-
-   The Standard Configuration sets options that may be incompatible
-   with systems where there are existing MySQL installations. If you
-   have an existing MySQL installation on your system in addition to
-   the installation you wish to configure, the Detailed Configuration
-   option is recommended.
+   single-user developer machine, the Standard Configuration
+   should suit your needs. Choosing the Standard Configuration
+   option causes the MySQL Configuration Wizard to set all
+   configuration options automatically with the exception of
+   Service Options and Security Options.
+
+   The Standard Configuration sets options that may be
+   incompatible with systems where there are existing MySQL
+   installations. If you have an existing MySQL installation on
+   your system in addition to the installation you wish to
+   configure, the Detailed Configuration option is recommended.
 
    To complete the Standard Configuration, please refer to the
    sections on Service Options and Security Options in Section
-   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11, "The
-   Security Options Dialog," respectively.
+   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11,
+   "The Security Options Dialog," respectively.
 
 2.3.6.4 The Server Type Dialog
 
-   There are three different server types available to choose from.
-   The server type that you choose affects the decisions that the
-   MySQL Server Instance Configuration Wizard makes with regard to
-   memory, disk, and processor usage.
+   There are three different server types available to choose
+   from. The server type that you choose affects the decisions
+   that the MySQL Server Instance Configuration Wizard makes
+   with regard to memory, disk, and processor usage.
    MySQL Server Instance Configuration Wizard: Server Type
 
-     * Developer Machine: Choose this option for a typical desktop
-       workstation where MySQL is intended only for personal use. It
-       is assumed that many other desktop applications are running.
-       The MySQL server is configured to use minimal system
-       resources.
-
-     * Server Machine: Choose this option for a server machine where
-       the MySQL server is running alongside other server
-       applications such as FTP, email, and Web servers. The MySQL
-       server is configured to use a moderate portion of the system
-       resources.
+     * Developer Machine: Choose this option for a typical
+       desktop workstation where MySQL is intended only for
+       personal use. It is assumed that many other desktop
+       applications are running. The MySQL server is configured
+       to use minimal system resources.
+
+     * Server Machine: Choose this option for a server machine
+       where the MySQL server is running alongside other server
+       applications such as FTP, email, and Web servers. The
+       MySQL server is configured to use a moderate portion of
+       the system resources.
 
      * Dedicated MySQL Server Machine: Choose this option for a
-       server machine that is intended to run only the MySQL server.
-       It is assumed that no other applications are running. The
-       MySQL server is configured to use all available system
-       resources.
+       server machine that is intended to run only the MySQL
+       server. It is assumed that no other applications are
+       running. The MySQL server is configured to use all
+       available system resources.
 
    Note
 
-   By selecting one of the preconfigured configurations, the values
-   and settings of various options in your my.cnf or my.ini will be
-   altered accordingly. The default values and options as described
-   in the reference manual may therefore be different to the options
-   and values that were created during the execution of the
-   configuration wizard.
+   By selecting one of the preconfigured configurations, the
+   values and settings of various options in your my.cnf or
+   my.ini will be altered accordingly. The default values and
+   options as described in the reference manual may therefore be
+   different to the options and values that were created during
+   the execution of the configuration wizard.
 
 2.3.6.5 The Database Usage Dialog
 
    The Database Usage dialog enables you to indicate the storage
-   engines that you expect to use when creating MySQL tables. The
-   option you choose determines whether the InnoDB storage engine is
-   available and what percentage of the server resources are
-   available to InnoDB.
+   engines that you expect to use when creating MySQL tables.
+   The option you choose determines whether the InnoDB storage
+   engine is available and what percentage of the server
+   resources are available to InnoDB.
    MySQL Server Instance Configuration Wizard: Usage Dialog
 
-     * Multifunctional Database: This option enables both the InnoDB
-       and MyISAM storage engines and divides resources evenly
-       between the two. This option is recommended for users who use
-       both storage engines on a regular basis.
+     * Multifunctional Database: This option enables both the
+       InnoDB and MyISAM storage engines and divides resources
+       evenly between the two. This option is recommended for
+       users who use both storage engines on a regular basis.
 
      * Transactional Database Only: This option enables both the
-       InnoDB and MyISAM storage engines, but dedicates most server
-       resources to the InnoDB storage engine. This option is
-       recommended for users who use InnoDB almost exclusively and
-       make only minimal use of MyISAM.
+       InnoDB and MyISAM storage engines, but dedicates most
+       server resources to the InnoDB storage engine. This
+       option is recommended for users who use InnoDB almost
+       exclusively and make only minimal use of MyISAM.
 
      * Non-Transactional Database Only: This option disables the
        InnoDB storage engine completely and dedicates all server
        resources to the MyISAM storage engine. This option is
        recommended for users who do not use InnoDB.
 
-   The Configuration Wizard uses a template to generate the server
-   configuration file. The Database Usage dialog sets one of the
-   following option strings:
+   The Configuration Wizard uses a template to generate the
+   server configuration file. The Database Usage dialog sets one
+   of the following option strings:
 Multifunctional Database:        MIXED
 Transactional Database Only:     INNODB
 Non-Transactional Database Only: MYISAM
@@ -2596,209 +2957,225 @@ skip-innodb
 
 2.3.6.6 The InnoDB Tablespace Dialog
 
-   Some users may want to locate the InnoDB tablespace files in a
-   different location than the MySQL server data directory. Placing
-   the tablespace files in a separate location can be desirable if
-   your system has a higher capacity or higher performance storage
-   device available, such as a RAID storage system.
-   MySQL Server Instance Configuration Wizard: InnoDB Data Tablespace
-
-   To change the default location for the InnoDB tablespace files,
-   choose a new drive from the drop-down list of drive letters and
-   choose a new path from the drop-down list of paths. To create a
-   custom path, click the ... button.
-
-   If you are modifying the configuration of an existing server, you
-   must click the Modify button before you change the path. In this
-   situation you must move the existing tablespace files to the new
-   location manually before starting the server.
+   Some users may want to locate the InnoDB tablespace files in
+   a different location than the MySQL server data directory.
+   Placing the tablespace files in a separate location can be
+   desirable if your system has a higher capacity or higher
+   performance storage device available, such as a RAID storage
+   system.
+   MySQL Server Instance Configuration Wizard: InnoDB Data
+   Tablespace
+
+   To change the default location for the InnoDB tablespace
+   files, choose a new drive from the drop-down list of drive
+   letters and choose a new path from the drop-down list of
+   paths. To create a custom path, click the ... button.
+
+   If you are modifying the configuration of an existing server,
+   you must click the Modify button before you change the path.
+   In this situation you must move the existing tablespace files
+   to the new location manually before starting the server.
 
 2.3.6.7 The Concurrent Connections Dialog
 
    To prevent the server from running out of resources, it is
-   important to limit the number of concurrent connections to the
-   MySQL server that can be established. The Concurrent Connections
-   dialog enables you to choose the expected usage of your server,
-   and sets the limit for concurrent connections accordingly. It is
-   also possible to set the concurrent connection limit manually.
+   important to limit the number of concurrent connections to
+   the MySQL server that can be established. The Concurrent
+   Connections dialog enables you to choose the expected usage
+   of your server, and sets the limit for concurrent connections
+   accordingly. It is also possible to set the concurrent
+   connection limit manually.
    MySQL Server Instance Configuration Wizard: Connections
 
-     * Decision Support (DSS)/OLAP: Choose this option if your server
-       does not require a large number of concurrent connections. The
-       maximum number of connections is set at 100, with an average
-       of 20 concurrent connections assumed.
-
-     * Online Transaction Processing (OLTP): Choose this option if
-       your server requires a large number of concurrent connections.
-       The maximum number of connections is set at 500.
-
-     * Manual Setting: Choose this option to set the maximum number
-       of concurrent connections to the server manually. Choose the
-       number of concurrent connections from the drop-down box
-       provided, or enter the maximum number of connections into the
-       drop-down box if the number you desire is not listed.
+     * Decision Support (DSS)/OLAP: Choose this option if your
+       server does not require a large number of concurrent
+       connections. The maximum number of connections is set at
+       100, with an average of 20 concurrent connections
+       assumed.
+
+     * Online Transaction Processing (OLTP): Choose this option
+       if your server requires a large number of concurrent
+       connections. The maximum number of connections is set at
+       500.
+
+     * Manual Setting: Choose this option to set the maximum
+       number of concurrent connections to the server manually.
+       Choose the number of concurrent connections from the
+       drop-down box provided, or enter the maximum number of
+       connections into the drop-down box if the number you
+       desire is not listed.
 
 2.3.6.8 The Networking and Strict Mode Options Dialog
 
    Use the Networking Options dialog to enable or disable TCP/IP
    networking and to configure the port number that is used to
    connect to the MySQL server.
-   MySQL Server Instance Configuration Wizard: Network Configuration
+   MySQL Server Instance Configuration Wizard: Network
+   Configuration
 
    TCP/IP networking is enabled by default. To disable TCP/IP
-   networking, uncheck the box next to the Enable TCP/IP Networking
-   option.
+   networking, uncheck the box next to the Enable TCP/IP
+   Networking option.
 
-   Port 3306 is used by default. To change the port used to access
-   MySQL, choose a new port number from the drop-down box or type a
-   new port number directly into the drop-down box. If the port
-   number you choose is in use, you are prompted to confirm your
-   choice of port number.
-
-   Set the Server SQL Mode to either enable or disable strict mode.
-   Enabling strict mode (default) makes MySQL behave more like other
-   database management systems. If you run applications that rely on
-   MySQL's old "forgiving" behavior, make sure to either adapt those
-   applications or to disable strict mode. For more information about
-   strict mode, see Section 5.1.7, "Server SQL Modes."
+   Port 3306 is used by default. To change the port used to
+   access MySQL, choose a new port number from the drop-down box
+   or type a new port number directly into the drop-down box. If
+   the port number you choose is in use, you are prompted to
+   confirm your choice of port number.
+
+   Set the Server SQL Mode to either enable or disable strict
+   mode. Enabling strict mode (default) makes MySQL behave more
+   like other database management systems. If you run
+   applications that rely on MySQL's old "forgiving" behavior,
+   make sure to either adapt those applications or to disable
+   strict mode. For more information about strict mode, see
+   Section 5.1.7, "Server SQL Modes."
 
 2.3.6.9 The Character Set Dialog
 
    The MySQL server supports multiple character sets and it is
-   possible to set a default server character set that is applied to
-   all tables, columns, and databases unless overridden. Use the
-   Character Set dialog to change the default character set of the
-   MySQL server.
+   possible to set a default server character set that is
+   applied to all tables, columns, and databases unless
+   overridden. Use the Character Set dialog to change the
+   default character set of the MySQL server.
    MySQL Server Instance Configuration Wizard: Character Set
 
-     * Standard Character Set: Choose this option if you want to use
-       latin1 as the default server character set. latin1 is used for
-       English and many Western European languages.
-
-     * Best Support For Multilingualism: Choose this option if you
-       want to use utf8 as the default server character set. This is
-       a Unicode character set that can store characters from many
-       different languages.
-
-     * Manual Selected Default Character Set / Collation: Choose this
-       option if you want to pick the server's default character set
-       manually. Choose the desired character set from the provided
-       drop-down list.
+     * Standard Character Set: Choose this option if you want to
+       use latin1 as the default server character set. latin1 is
+       used for English and many Western European languages.
+
+     * Best Support For Multilingualism: Choose this option if
+       you want to use utf8 as the default server character set.
+       This is a Unicode character set that can store characters
+       from many different languages.
+
+     * Manual Selected Default Character Set / Collation: Choose
+       this option if you want to pick the server's default
+       character set manually. Choose the desired character set
+       from the provided drop-down list.
 
 2.3.6.10 The Service Options Dialog
 
    On Windows platforms, the MySQL server can be installed as a
-   Windows service. When installed this way, the MySQL server can be
-   started automatically during system startup, and even restarted
-   automatically by Windows in the event of a service failure.
-
-   The MySQL Server Instance Configuration Wizard installs the MySQL
-   server as a service by default, using the service name MySQL. If
-   you do not wish to install the service, uncheck the box next to
-   the Install As Windows Service option. You can change the service
-   name by picking a new service name from the drop-down box provided
-   or by entering a new service name into the drop-down box.
-   Note
-
-   Service names can include any legal character except forward (/)
-   or backward (\) slashes, and must be less than 256 characters
-   long.
+   Windows service. When installed this way, the MySQL server
+   can be started automatically during system startup, and even
+   restarted automatically by Windows in the event of a service
+   failure.
+
+   The MySQL Server Instance Configuration Wizard installs the
+   MySQL server as a service by default, using the service name
+   MySQL. If you do not wish to install the service, uncheck the
+   box next to the Install As Windows Service option. You can
+   change the service name by picking a new service name from
+   the drop-down box provided or by entering a new service name
+   into the drop-down box.
+   Note
+
+   Service names can include any legal character except forward
+   (/) or backward (\) slashes, and must be less than 256
+   characters long.
    Warning
 
-   If you are installing multiple versions of MySQL onto the same
-   machine, you must choose a different service name for each version
-   that you install. If you do not choose a different service for
-   each installed version then the service manager information will
-   be inconsistent and this will cause problems when you try to
-   uninstall a previous version.
-
-   If you have already installed multiple versions using the same
-   service name, you must manually edit the contents of the
-   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services parameters
-   within the Windows registry to update the association of the
-   service name with the correct server version.
-
-   Typically, when installing multiple versions you create a service
-   name based on the version information. For example, you might
-   install MySQL 5.x as mysql5, or specific versions such as MySQL
-   5.5.0 as mysql50500.
-
-   To install the MySQL server as a service but not have it started
-   automatically at startup, uncheck the box next to the Launch the
-   MySQL Server Automatically option.
+   If you are installing multiple versions of MySQL onto the
+   same machine, you must choose a different service name for
+   each version that you install. If you do not choose a
+   different service for each installed version then the service
+   manager information will be inconsistent and this will cause
+   problems when you try to uninstall a previous version.
+
+   If you have already installed multiple versions using the
+   same service name, you must manually edit the contents of the
+   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services
+   parameters within the Windows registry to update the
+   association of the service name with the correct server
+   version.
+
+   Typically, when installing multiple versions you create a
+   service name based on the version information. For example,
+   you might install MySQL 5.x as mysql5, or specific versions
+   such as MySQL 5.5.0 as mysql50500.
+
+   To install the MySQL server as a service but not have it
+   started automatically at startup, uncheck the box next to the
+   Launch the MySQL Server Automatically option.
 
 2.3.6.11 The Security Options Dialog
 
-   The content of the security options portion of the MySQL Server
-   Instance Configuration Wizard will depend on whether this is a new
-   installation, or modifying an existing installation.
+   The content of the security options portion of the MySQL
+   Server Instance Configuration Wizard will depend on whether
+   this is a new installation, or modifying an existing
+   installation.
 
      * Setting the root password for a new installation
-       It is strongly recommended that you set a root password for
-       your MySQL server, and the MySQL Server Instance Config Wizard
-       requires by default that you do so. If you do not wish to set
-       a root password, uncheck the box next to the Modify Security
-       Settings option.
+       It is strongly recommended that you set a root password
+       for your MySQL server, and the MySQL Server Instance
+       Config Wizard requires by default that you do so. If you
+       do not wish to set a root password, uncheck the box next
+       to the Modify Security Settings option.
        MySQL Server Instance Config Wizard: Security
 
-     * To set the root password, enter the desired password into both
-       the New root password and Confirm boxes.
+     * To set the root password, enter the desired password into
+       both the New root password and Confirm boxes.
        Setting the root password for an existing installation
        If you are modifying the configuration of an existing
-       configuration, or you are installing an upgrade and the MySQL
-       Server Instance Configuration Wizard has detected an existing
-       MySQL system, then you must enter the existing password for
-       root before changing the configuration information.
+       configuration, or you are installing an upgrade and the
+       MySQL Server Instance Configuration Wizard has detected
+       an existing MySQL system, then you must enter the
+       existing password for root before changing the
+       configuration information.
        MySQL Server Instance Config Wizard: Security (Existing
        Installation)
-       If you want to change the current root password, enter the
-       desired new password into both the New root password and
-       Confirm boxes.
-
-   To permit root logins from across the network, check the box next
-   to the Enable root access from remote machines option. This
-   decreases the security of your root account.
-
-   To create an anonymous user account, check the box next to the
-   Create An Anonymous Account option. Creating an anonymous account
-   can decrease server security and cause login and permission
-   difficulties. For this reason, it is not recommended.
+       If you want to change the current root password, enter
+       the desired new password into both the New root password
+       and Confirm boxes.
+
+   To permit root logins from across the network, check the box
+   next to the Enable root access from remote machines option.
+   This decreases the security of your root account.
+
+   To create an anonymous user account, check the box next to
+   the Create An Anonymous Account option. Creating an anonymous
+   account can decrease server security and cause login and
+   permission difficulties. For this reason, it is not
+   recommended.
 
 2.3.6.12 The Confirmation Dialog
 
-   The final dialog in the MySQL Server Instance Configuration Wizard
-   is the Confirmation Dialog. To start the configuration process,
-   click the Execute button. To return to a previous dialog, click
-   the Back button. To exit the MySQL Server Instance Configuration
-   Wizard without configuring the server, click the Cancel button.
+   The final dialog in the MySQL Server Instance Configuration
+   Wizard is the Confirmation Dialog. To start the configuration
+   process, click the Execute button. To return to a previous
+   dialog, click the Back button. To exit the MySQL Server
+   Instance Configuration Wizard without configuring the server,
+   click the Cancel button.
    MySQL Server Instance Configuration Wizard: Confirmation
 
    After you click the Execute button, the MySQL Server Instance
-   Configuration Wizard performs a series of tasks and displays the
-   progress onscreen as the tasks are performed.
+   Configuration Wizard performs a series of tasks and displays
+   the progress onscreen as the tasks are performed.
 
-   The MySQL Server Instance Configuration Wizard first determines
-   configuration file options based on your choices using a template
-   prepared by MySQL developers and engineers. This template is named
-   my-template.ini and is located in your server installation
-   directory.
-
-   The MySQL Configuration Wizard then writes these options to the
-   corresponding configuration file.
-
-   If you chose to create a service for the MySQL server, the MySQL
-   Server Instance Configuration Wizard creates and starts the
-   service. If you are reconfiguring an existing service, the MySQL
-   Server Instance Configuration Wizard restarts the service to apply
-   your configuration changes.
+   The MySQL Server Instance Configuration Wizard first
+   determines configuration file options based on your choices
+   using a template prepared by MySQL developers and engineers.
+   This template is named my-template.ini and is located in your
+   server installation directory.
+
+   The MySQL Configuration Wizard then writes these options to
+   the corresponding configuration file.
+
+   If you chose to create a service for the MySQL server, the
+   MySQL Server Instance Configuration Wizard creates and starts
+   the service. If you are reconfiguring an existing service,
+   the MySQL Server Instance Configuration Wizard restarts the
+   service to apply your configuration changes.
 
    If you chose to set a root password, the MySQL Configuration
-   Wizard connects to the server, sets your new root password, and
-   applies any other security settings you may have selected.
-
-   After the MySQL Server Instance Configuration Wizard has completed
-   its tasks, it displays a summary. Click the Finish button to exit
-   the MySQL Server Configuration Wizard.
+   Wizard connects to the server, sets your new root password,
+   and applies any other security settings you may have
+   selected.
+
+   After the MySQL Server Instance Configuration Wizard has
+   completed its tasks, it displays a summary. Click the Finish
+   button to exit the MySQL Server Configuration Wizard.
 
 2.3.6.13 MySQL Server Instance Config Wizard: Creating an Instance
 from the Command Line
@@ -2808,24 +3185,27 @@ from the Command Line
    automatically from the command line.
 
    To use the MySQL Server Instance Config Wizard on the command
-   line, you need to use the MySQLInstanceConfig.exe command that is
-   installed with MySQL in the bin directory within the installation
-   directory. MySQLInstanceConfig.exe takes a number of command-line
-   arguments the set the properties that would normally be selected
-   through the GUI interface, and then creates a new configuration
-   file (my.ini) by combining these selections with a template
-   configuration file to produce the working configuration file.
-
-   The main command line options are provided in the table below.
-   Some of the options are required, while some options are optional.
+   line, you need to use the MySQLInstanceConfig.exe command
+   that is installed with MySQL in the bin directory within the
+   installation directory. MySQLInstanceConfig.exe takes a
+   number of command-line arguments the set the properties that
+   would normally be selected through the GUI interface, and
+   then creates a new configuration file (my.ini) by combining
+   these selections with a template configuration file to
+   produce the working configuration file.
+
+   The main command line options are provided in the table
+   below. Some of the options are required, while some options
+   are optional.
 
-   Table 2.5 MySQL Server Instance Config Wizard Command Line Options
+   Table 2.5 MySQL Server Instance Config Wizard Command Line
+   Options
    Option Description
    Required Parameters
    -nPRODUCTNAME The name of the instance when installed
    -pPATH Path of the base directory for installation. This is
-   equivalent to the directory when using the basedir configuration
-   parameter
+   equivalent to the directory when using the basedir
+   configuration parameter
    -vVERSION The version tag to use for this installation
    Action to Perform
    -i Install an instance
@@ -2834,95 +3214,97 @@ from the Command Line
    -q Perform the operation quietly
    -lFILENAME Sae the installation progress in a logfile
    Config File to Use
-   -tFILENAME Path to the template config file that will be used to
-   generate the installed configuration file
+   -tFILENAME Path to the template config file that will be used
+   to generate the installed configuration file
    -cFILENAME Path to a config file to be generated
 
    The -t and -c options work together to set the configuration
    parameters for a new instance. The -t option specifies the
-   template configuration file to use as the basic configuration,
-   which are then merged with the configuration parameters generated
-   by the MySQL Server Instance Config Wizard into the configuration
-   file specified by the -c option.
+   template configuration file to use as the basic
+   configuration, which are then merged with the configuration
+   parameters generated by the MySQL Server Instance Config
+   Wizard into the configuration file specified by the -c
+   option.
 
    A sample template file, my-template.ini is provided in the
-   toplevel MySQL installation directory. The file contains elements
-   are replaced automatically by the MySQL Server Instance Config
-   Wizard during configuration.
+   toplevel MySQL installation directory. The file contains
+   elements are replaced automatically by the MySQL Server
+   Instance Config Wizard during configuration.
 
    If you specify a configuration file that already exists, the
-   existing configuration file will be saved in the file with the
-   original, with the date and time added. For example, the mysql.ini
-   will be copied to mysql 2009-10-27 1646.ini.bak.
+   existing configuration file will be saved in the file with
+   the original, with the date and time added. For example, the
+   mysql.ini will be copied to mysql 2009-10-27 1646.ini.bak.
 
-   The parameters that you can specify on the command line are listed
-   in the table below.
+   The parameters that you can specify on the command line are
+   listed in the table below.
 
    Table 2.6 MySQL Server Instance Config Wizard Parameters
    Parameter Description
    ServiceName=$ Specify the name of the service to be created
    AddBinToPath={yes | no} Specifies whether to add the binary
    directory of MySQL to the standard PATH environment variable
-   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the server
-   type. For more information, see Section 2.3.6.4, "The Server Type
-   Dialog"
+   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the
+   server type. For more information, see Section 2.3.6.4, "The
+   Server Type Dialog"
    DatabaseType={MIXED | INNODB | MYISAM} Specify the default
-   database type. For more information, see Section 2.3.6.5, "The
-   Database Usage Dialog"
+   database type. For more information, see Section 2.3.6.5,
+   "The Database Usage Dialog"
    ConnectionUsage={DSS | OLTP} Specify the type of connection
-   support, this automates the setting for the number of concurrent
-   connections (see the ConnectionCount parameter). For more
-   information, see Section 2.3.6.7, "The Concurrent Connections
-   Dialog"
-   ConnectionCount=# Specify the number of concurrent connections to
-   support. For more information, see Section 2.3.6.4, "The Server
-   Type Dialog"
-   SkipNetworking={yes | no} Specify whether network support should
-   be supported. Specifying yes disables network access altogether
+   support, this automates the setting for the number of
+   concurrent connections (see the ConnectionCount parameter).
+   For more information, see Section 2.3.6.7, "The Concurrent
+   Connections Dialog"
+   ConnectionCount=# Specify the number of concurrent
+   connections to support. For more information, see Section
+   2.3.6.4, "The Server Type Dialog"
+   SkipNetworking={yes | no} Specify whether network support
+   should be supported. Specifying yes disables network access
+   altogether
    Port=# Specify the network port number to use for network
    connections. For more information, see Section 2.3.6.8, "The
    Networking and Strict Mode Options Dialog"
-   StrictMode={yes | no} Specify whether to use the strict SQL mode.
-   For more information, see Section 2.3.6.8, "The Networking and
-   Strict Mode Options Dialog"
-   Charset=$ Specify the default character set. For more information,
-   see Section 2.3.6.9, "The Character Set Dialog"
+   StrictMode={yes | no} Specify whether to use the strict SQL
+   mode. For more information, see Section 2.3.6.8, "The
+   Networking and Strict Mode Options Dialog"
+   Charset=$ Specify the default character set. For more
+   information, see Section 2.3.6.9, "The Character Set Dialog"
    RootPassword=$ Specify the root password
    RootCurrentPassword=$ Specify the current root password then
    stopping or reconfiguring an existing service
    Note
 
-   When specifying options on the command line, you can enclose the
-   entire command-line option and the value you are specifying using
-   double quotation marks. This enables you to use spaces in the
-   options. For example, "-cC:\mysql.ini".
-
-   The following command installs a MySQL Server 5.5 instance from
-   the directory C:\Program Files\MySQL\MySQL Server 5.5 using the
-   service name MySQL55 and setting the root password to 1234.
+   When specifying options on the command line, you can enclose
+   the entire command-line option and the value you are
+   specifying using double quotation marks. This enables you to
+   use spaces in the options. For example, "-cC:\mysql.ini".
+
+   The following command installs a MySQL Server 5.5 instance
+   from the directory C:\Program Files\MySQL\MySQL Server 5.5
+   using the service name MySQL55 and setting the root password
+   to 1234.
 shell> MySQLInstanceConfig.exe -i -q "-lC:\mysql_install_log.txt" »
-   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -
-v5.5.41 »
-   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Datab
-aseType=MIXED »
-   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=123
-4
+   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -v
+5.5.42 »
+   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Databa
+seType=MIXED »
+   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=1234
 
    In the above example, a log file will be generated in
    mysql_install_log.txt containing the information about the
-   instance creation process. The log file generated by the above
-   example is shown below:
+   instance creation process. The log file generated by the
+   above example is shown below:
 Welcome to the MySQL Server Instance Configuration Wizard 1.0.16.0
 Date: 2009-10-27 17:07:21
 
 Installing service ...
 
 Product Name:         MySQL Server 5.5
-Version:              5.5.41
+Version:              5.5.42
 Installation Path:    C:\Program Files\MySQL\MySQL Server 5.5\
 
-Creating configuration file C:\mytest.ini using template my-template.
-ini.
+Creating configuration file C:\mytest.ini using template my-template.i
+ni.
 Options:
 DEVELOPMENT
 MIXED
@@ -2938,14 +3320,16 @@ datadir: "C:/Program Files/MySQL/MySQL S
 
 Creating Windows service entry.
 Service name: "MySQL55"
-Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --
-defaults-file="C:\mytest.ini" MySQL55.
+Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --d
+efaults-file="C:\mytest.ini" MySQL55.
 Windows service MySQL55 installed.
 
-   When using the command line, the return values in the following
-   table indicate an error performing the specified option.
+   When using the command line, the return values in the
+   following table indicate an error performing the specified
+   option.
 
-   Table 2.7 Return Value from MySQL Server Instance Config Wizard
+   Table 2.7 Return Value from MySQL Server Instance Config
+   Wizard
    Value                   Description
    2     Configuration template file cannot be found
    3     The Windows service entry cannot be created
@@ -2956,17 +3340,18 @@ Windows service MySQL55 installed.
    8     The configuration file cannot be written
    9     The Windows service entry cannot be removed
 
-   You can perform an installation of MySQL automatically using the
-   MSI package. For more information, see Section 2.3.5.2,
-   "Automating MySQL Installation on Microsoft Windows Using the MSI
-   Package."
+   You can perform an installation of MySQL automatically using
+   the MSI package. For more information, see Section 2.3.5.2,
+   "Automating MySQL Installation on Microsoft Windows Using the
+   MSI Package."
 
 2.3.7 Installing MySQL on Microsoft Windows Using a noinstall Zip
 Archive
 
-   Users who are installing from the noinstall package can use the
-   instructions in this section to manually install MySQL. The
-   process for installing MySQL from a Zip archive is as follows:
+   Users who are installing from the noinstall package can use
+   the instructions in this section to manually install MySQL.
+   The process for installing MySQL from a Zip archive is as
+   follows:
 
     1. Extract the archive to the desired install directory
 
@@ -2984,188 +3369,204 @@ Archive
 
    To install MySQL manually, do the following:
 
-    1. If you are upgrading from a previous version please refer to
-       Section 2.3.9, "Upgrading MySQL on Windows," before beginning
-       the upgrade process.
+    1. If you are upgrading from a previous version please refer
+       to Section 2.3.9, "Upgrading MySQL on Windows," before
+       beginning the upgrade process.
 
-    2. Make sure that you are logged in as a user with administrator
-       privileges.
+    2. Make sure that you are logged in as a user with
+       administrator privileges.
 
     3. Choose an installation location. Traditionally, the MySQL
-       server is installed in C:\mysql. The MySQL Installation Wizard
-       installs MySQL under C:\Program Files\MySQL. If you do not
-       install MySQL at C:\mysql, you must specify the path to the
-       install directory during startup or in an option file. See
-       Section 2.3.7.2, "Creating an Option File."
+       server is installed in C:\mysql. The MySQL Installation
+       Wizard installs MySQL under C:\Program Files\MySQL. If
+       you do not install MySQL at C:\mysql, you must specify
+       the path to the install directory during startup or in an
+       option file. See Section 2.3.7.2, "Creating an Option
+       File."
+       Note
+       The MySQL Installer installs MySQL under C:\Program
+       Files\MySQL.
 
     4. Extract the install archive to the chosen installation
-       location using your preferred Zip archive tool. Some tools may
-       extract the archive to a folder within your chosen
-       installation location. If this occurs, you can move the
-       contents of the subfolder into the chosen installation
-       location.
+       location using your preferred Zip archive tool. Some
+       tools may extract the archive to a folder within your
+       chosen installation location. If this occurs, you can
+       move the contents of the subfolder into the chosen
+       installation location.
 
 2.3.7.2 Creating an Option File
 
-   If you need to specify startup options when you run the server,
-   you can indicate them on the command line or place them in an
-   option file. For options that are used every time the server
-   starts, you may find it most convenient to use an option file to
-   specify your MySQL configuration. This is particularly true under
-   the following circumstances:
-
-     * The installation or data directory locations are different
-       from the default locations (C:\Program Files\MySQL\MySQL
-       Server 5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data).
-
-     * You need to tune the server settings, such as memory, cache,
-       or InnoDB configuration information.
-
-   When the MySQL server starts on Windows, it looks for option files
-   in several locations, such as the Windows directory, C:\, and the
-   MySQL installation directory (for the full list of locations, see
-   Section 4.2.6, "Using Option Files"). The Windows directory
-   typically is named something like C:\WINDOWS. You can determine
-   its exact location from the value of the WINDIR environment
-   variable using the following command:
+   If you need to specify startup options when you run the
+   server, you can indicate them on the command line or place
+   them in an option file. For options that are used every time
+   the server starts, you may find it most convenient to use an
+   option file to specify your MySQL configuration. This is
+   particularly true under the following circumstances:
+
+     * The installation or data directory locations are
+       different from the default locations (C:\Program
+       Files\MySQL\MySQL Server 5.5 and C:\Program
+       Files\MySQL\MySQL Server 5.5\data).
+
+     * You need to tune the server settings, such as memory,
+       cache, or InnoDB configuration information.
+
+   When the MySQL server starts on Windows, it looks for option
+   files in several locations, such as the Windows directory,
+   C:\, and the MySQL installation directory (for the full list
+   of locations, see Section 4.2.6, "Using Option Files"). The
+   Windows directory typically is named something like
+   C:\WINDOWS. You can determine its exact location from the
+   value of the WINDIR environment variable using the following
+   command:
 C:\> echo %WINDIR%
 
-   MySQL looks for options in each location first in the my.ini file,
-   and then in the my.cnf file. However, to avoid confusion, it is
-   best if you use only one file. If your PC uses a boot loader where
-   C: is not the boot drive, your only option is to use the my.ini
-   file. Whichever option file you use, it must be a plain text file.
-   Note
-
-   When using the MySQL Installer to install MySQL Server, it will
-   create the my.ini at the default location. And as of MySQL Server
-   5.5.27, the user running MySQL Installer is granted full
-   permissions to this new my.ini.
-
-   In other words, be sure that the MySQL Server user has permission
-   to read the my.ini file.
-
-   You can also make use of the example option files included with
-   your MySQL distribution; see Section 5.1.2, "Server Configuration
-   Defaults."
-
-   An option file can be created and modified with any text editor,
-   such as Notepad. For example, if MySQL is installed in E:\mysql
-   and the data directory is in E:\mydata\data, you can create an
-   option file containing a [mysqld] section to specify values for
-   the basedir and datadir options:
+   MySQL looks for options in each location first in the my.ini
+   file, and then in the my.cnf file. However, to avoid
+   confusion, it is best if you use only one file. If your PC
+   uses a boot loader where C: is not the boot drive, your only
+   option is to use the my.ini file. Whichever option file you
+   use, it must be a plain text file.
+   Note
+
+   When using the MySQL Installer to install MySQL Server, it
+   will create the my.ini at the default location. And as of
+   MySQL Server 5.5.27, the user running MySQL Installer is
+   granted full permissions to this new my.ini.
+
+   In other words, be sure that the MySQL Server user has
+   permission to read the my.ini file.
+
+   You can also make use of the example option files included
+   with your MySQL distribution; see Section 5.1.2, "Server
+   Configuration Defaults."
+
+   An option file can be created and modified with any text
+   editor, such as Notepad. For example, if MySQL is installed
+   in E:\mysql and the data directory is in E:\mydata\data, you
+   can create an option file containing a [mysqld] section to
+   specify values for the basedir and datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=E:/mydata/data
 
-   Note that Windows path names are specified in option files using
-   (forward) slashes rather than backslashes. If you do use
-   backslashes, double them:
+   Microsoft Windows path names are specified in option files
+   using (forward) slashes rather than backslashes. If you do
+   use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=E:\\mysql
 # set datadir to the location of your data directory
 datadir=E:\\mydata\\data
 
-   The rules for use of backslash in option file values are given in
-   Section 4.2.6, "Using Option Files."
+   The rules for use of backslash in option file values are
+   given in Section 4.2.6, "Using Option Files."
 
-   The data directory is located within the AppData directory for the
-   user running MySQL.
+   The data directory is located within the AppData directory
+   for the user running MySQL.
 
-   If you would like to use a data directory in a different location,
-   you should copy the entire contents of the data directory to the
-   new location. For example, if you want to use E:\mydata as the
-   data directory instead, you must do two things:
-
-    1. Move the entire data directory and all of its contents from
-       the default location (for example C:\Program Files\MySQL\MySQL
-       Server 5.5\data) to E:\mydata.
+   If you would like to use a data directory in a different
+   location, you should copy the entire contents of the data
+   directory to the new location. For example, if you want to
+   use E:\mydata as the data directory instead, you must do two
+   things:
+
+    1. Move the entire data directory and all of its contents
+       from the default location (for example C:\Program
+       Files\MySQL\MySQL Server 5.5\data) to E:\mydata.
 
     2. Use a --datadir option to specify the new data directory
        location each time you start the server.
 
 2.3.7.3 Selecting a MySQL Server Type
 
-   The following table shows the available servers for Windows in
-   MySQL 5.5.
+   The following table shows the available servers for Windows
+   in MySQL 5.5.
    Binary Description
    mysqld Optimized binary with named-pipe support
-   mysqld-debug Like mysqld, but compiled with full debugging and
-   automatic memory allocation checking
+   mysqld-debug Like mysqld, but compiled with full debugging
+   and automatic memory allocation checking
 
    All of the preceding binaries are optimized for modern Intel
    processors, but should work on any Intel i386-class or higher
    processor.
 
    Each of the servers in a distribution support the same set of
-   storage engines. The SHOW ENGINES statement displays which engines
-   a given server supports.
+   storage engines. The SHOW ENGINES statement displays which
+   engines a given server supports.
 
-   All Windows MySQL 5.5 servers have support for symbolic linking of
-   database directories.
+   All Windows MySQL 5.5 servers have support for symbolic
+   linking of database directories.
 
-   MySQL supports TCP/IP on all Windows platforms. MySQL servers on
-   Windows also support named pipes, if you start the server with the
-   --enable-named-pipe option. It is necessary to use this option
-   explicitly because some users have experienced problems with
-   shutting down the MySQL server when named pipes were used. The
-   default is to use TCP/IP regardless of platform because named
-   pipes are slower than TCP/IP in many Windows configurations.
+   MySQL supports TCP/IP on all Windows platforms. MySQL servers
+   on Windows also support named pipes, if you start the server
+   with the --enable-named-pipe option. It is necessary to use
+   this option explicitly because some users have experienced
+   problems with shutting down the MySQL server when named pipes
+   were used. The default is to use TCP/IP regardless of
+   platform because named pipes are slower than TCP/IP in many
+   Windows configurations.
 
 2.3.7.4 Starting the Server for the First Time
 
    This section gives a general overview of starting the MySQL
-   server. The following sections provide more specific information
-   for starting the MySQL server from the command line or as a
-   Windows service.
+   server. The following sections provide more specific
+   information for starting the MySQL server from the command
+   line or as a Windows service.
 
    The information here applies primarily if you installed MySQL
-   using the Noinstall version, or if you wish to configure and test
-   MySQL manually rather than with the GUI tools.
+   using the Noinstall version, or if you wish to configure and
+   test MySQL manually rather than with the GUI tools.
+   Note
+
+   The MySQL server will automatically start after using the
+   MySQL Installer, and the MySQL Notifier GUI can be used to
+   start/stop/restart at any time.
 
    The examples in these sections assume that MySQL is installed
-   under the default location of C:\Program Files\MySQL\MySQL Server
-   5.5. Adjust the path names shown in the examples if you have MySQL
-   installed in a different location.
-
-   Clients have two options. They can use TCP/IP, or they can use a
-   named pipe if the server supports named-pipe connections.
-
-   MySQL for Windows also supports shared-memory connections if the
-   server is started with the --shared-memory option. Clients can
-   connect through shared memory by using the --protocol=MEMORY
-   option.
+   under the default location of C:\Program Files\MySQL\MySQL
+   Server 5.5. Adjust the path names shown in the examples if
+   you have MySQL installed in a different location.
+
+   Clients have two options. They can use TCP/IP, or they can
+   use a named pipe if the server supports named-pipe
+   connections.
+
+   MySQL for Windows also supports shared-memory connections if
+   the server is started with the --shared-memory option.
+   Clients can connect through shared memory by using the
+   --protocol=MEMORY option.
 
    For information about which server binary to run, see Section
    2.3.7.3, "Selecting a MySQL Server Type."
 
-   Testing is best done from a command prompt in a console window (or
-   "DOS window"). In this way you can have the server display status
-   messages in the window where they are easy to see. If something is
-   wrong with your configuration, these messages make it easier for
-   you to identify and fix any problems.
+   Testing is best done from a command prompt in a console
+   window (or "DOS window"). In this way you can have the server
+   display status messages in the window where they are easy to
+   see. If something is wrong with your configuration, these
+   messages make it easier for you to identify and fix any
+   problems.
 
    To start the server, enter this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --console
 
    For a server that includes InnoDB support, you should see the
-   messages similar to those following as it starts (the path names
-   and sizes may differ):
+   messages similar to those following as it starts (the path
+   names and sizes may differ):
 InnoDB: The first specified datafile c:\ibdata\ibdata1 did not exist:
 InnoDB: a new database to be created!
 InnoDB: Setting file c:\ibdata\ibdata1 size to 209715200
 InnoDB: Database physically writes the file full: wait...
-InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile0 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile1 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile2 size to 31457280
 InnoDB: Doublewrite buffer not found: creating new
 InnoDB: Doublewrite buffer created
@@ -3174,151 +3575,170 @@ InnoDB: foreign key constraint system ta
 011024 10:58:25  InnoDB: Started
 
    When the server finishes its startup sequence, you should see
-   something like this, which indicates that the server is ready to
-   service client connections:
+   something like this, which indicates that the server is ready
+   to service client connections:
 mysqld: ready for connections
-Version: '5.5.41'  socket: ''  port: 3306
+Version: '5.5.42'  socket: ''  port: 3306
 
    The server continues to write to the console any further
-   diagnostic output it produces. You can open a new console window
-   in which to run client programs.
+   diagnostic output it produces. You can open a new console
+   window in which to run client programs.
 
-   If you omit the --console option, the server writes diagnostic
-   output to the error log in the data directory (C:\Program
-   Files\MySQL\MySQL Server 5.5\data by default). The error log is
-   the file with the .err extension, or may be specified by passing
-   in the --log-error option.
+   If you omit the --console option, the server writes
+   diagnostic output to the error log in the data directory
+   (C:\Program Files\MySQL\MySQL Server 5.5\data by default).
+   The error log is the file with the .err extension, and may be
+   set using the --log-error option.
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.10.2,
-   "Securing the Initial MySQL Accounts."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
 
 2.3.7.5 Starting MySQL from the Windows Command Line
 
-   The MySQL server can be started manually from the command line.
-   This can be done on any version of Windows.
+   The MySQL server can be started manually from the command
+   line. This can be done on any version of Windows.
+   Note
 
-   To start the mysqld server from the command line, you should start
-   a console window (or "DOS window") and enter this command:
+   The MySQL Notifier GUI can also be used to start/stop/restart
+   the MySQL server.
+
+   To start the mysqld server from the command line, you should
+   start a console window (or "DOS window") and enter this
+   command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
 
-   The path to mysqld may vary depending on the install location of
-   MySQL on your system.
+   The path to mysqld may vary depending on the install location
+   of MySQL on your system.
 
    You can stop the MySQL server by executing this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" -u root
- shutdown
+shutdown
 
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
-
-   If mysqld doesn't start, check the error log to see whether the
-   server wrote any messages there to indicate the cause of the
-   problem. By default, the error log is located in the C:\Program
-   Files\MySQL\MySQL Server 5.5\data directory. It is the file with a
-   suffix of .err, or may be specified by passing in the --log-error
-   option. Alternatively, you can try to start the server as mysqld
-   --console; in this case, you may get some useful information on
-   the screen that may help solve the problem.
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
 
-   The last option is to start mysqld with the --standalone and
-   --debug options. In this case, mysqld writes a log file
-   C:\mysqld.trace that should contain the reason why mysqld doesn't
-   start. See Section 24.4.3, "The DBUG Package."
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
+   Note
 
-   Use mysqld --verbose --help to display all the options that mysqld
-   supports.
+   Users in the MySQL grant system are wholly independent from
+   any login users under Microsoft Windows.
 
-2.3.7.6 Customizing the PATH for MySQL Tools
+   If mysqld doesn't start, check the error log to see whether
+   the server wrote any messages there to indicate the cause of
+   the problem. By default, the error log is located in the
+   C:\Program Files\MySQL\MySQL Server 5.5\data directory. It is
+   the file with a suffix of .err, or may be specified by
+   passing in the --log-error option. Alternatively, you can try
+   to start the server with the --console option; in this case,
+   the server may display some useful information on the screen
+   that will help solve the problem.
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
+   The last option is to start mysqld with the --standalone and
+   --debug options. In this case, mysqld writes a log file
+   C:\mysqld.trace that should contain the reason why mysqld
+   doesn't start. See Section 24.4.3, "The DBUG Package."
 
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
+   Use mysqld --verbose --help to display all the options that
+   mysqld supports.
 
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
+2.3.7.6 Customizing the PATH for MySQL Tools
 
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
+
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
+
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
+
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin)
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin)
        Note
-       There must be a semicolon separating this path from any values
-       present in this field.
-       Dismiss this dialogue, and each dialogue in turn, by clicking
-       OK until all of the dialogues that were opened have been
-       dismissed. You should now be able to invoke any MySQL
-       executable program by typing its name at the DOS prompt from
-       any directory on the system, without having to supply the
-       path. This includes the servers, the mysql client, and all
-       MySQL command-line utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       There must be a semicolon separating this path from any
+       values present in this field.
+       Dismiss this dialogue, and each dialogue in turn, by
+       clicking OK until all of the dialogues that were opened
+       have been dismissed. You should now be able to invoke any
+       MySQL executable program by typing its name at the DOS
+       prompt from any directory on the system, without having
+       to supply the path. This includes the servers, the mysql
+       client, and all MySQL command-line utilities such as
+       mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
 
 2.3.7.7 Starting MySQL as a Windows Service
 
-   On Windows, the recommended way to run MySQL is to install it as a
-   Windows service, so that MySQL starts and stops automatically when
-   Windows starts and stops. A MySQL server installed as a service
-   can also be controlled from the command line using NET commands,
-   or with the graphical Services utility. Generally, to install
-   MySQL as a Windows service you should be logged in using an
-   account that has administrator rights.
-
-   The Services utility (the Windows Service Control Manager) can be
-   found in the Windows Control Panel (under Administrative Tools on
-   Windows 2000, XP, Vista, and Server 2003). To avoid conflicts, it
-   is advisable to close the Services utility while performing server
-   installation or removal operations from the command line.
+   On Windows, the recommended way to run MySQL is to install it
+   as a Windows service, so that MySQL starts and stops
+   automatically when Windows starts and stops. A MySQL server
+   installed as a service can also be controlled from the
+   command line using NET commands, or with the graphical
+   Services utility. Generally, to install MySQL as a Windows
+   service you should be logged in using an account that has
+   administrator rights.
+   Note
+
+   The MySQL Notifier GUI can also be used to monitor the status
+   of the MySQL service.
+
+   The Services utility (the Windows Service Control Manager)
+   can be found in the Windows Control Panel (under
+   Administrative Tools on Windows 2000, XP, Vista, and Server
+   2003). To avoid conflicts, it is advisable to close the
+   Services utility while performing server installation or
+   removal operations from the command line.
 
 Installing the service
 
-   Before installing MySQL as a Windows service, you should first
-   stop the current server if it is running by using the following
-   command:
+   Before installing MySQL as a Windows service, you should
+   first stop the current server if it is running by using the
+   following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin"
           -u root shutdown
 
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
+
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
+   Note
+
+   Users in the MySQL grant system are wholly independent from
+   any login users under Windows.
 
    Install the server as a service using this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install
@@ -3326,284 +3746,308 @@ C:\> "C:\Program Files\MySQL\MySQL Serve
    The service-installation command does not start the server.
    Instructions for that are given later in this section.
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
-
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
-
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
-
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
+
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
+
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
+
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin), Note that there should be a semicolon separating
-       this path from any values present in this field. Dismiss this
-       dialogue, and each dialogue in turn, by clicking OK until all
-       of the dialogues that were opened have been dismissed. You
-       should now be able to invoke any MySQL executable program by
-       typing its name at the DOS prompt from any directory on the
-       system, without having to supply the path. This includes the
-       servers, the mysql client, and all MySQL command-line
-       utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin), and there should be a
+       semicolon separating this path from any values present in
+       this field. Dismiss this dialogue, and each dialogue in
+       turn, by clicking OK until all of the dialogues that were
+       opened have been dismissed. You should now be able to
+       invoke any MySQL executable program by typing its name at
+       the DOS prompt from any directory on the system, without
+       having to supply the path. This includes the servers, the
+       mysql client, and all MySQL command-line utilities such
+       as mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
 
-   The following additional arguments can be used when installing the
-   service:
+   The following additional arguments can be used when
+   installing the service:
 
      * You can specify a service name immediately following the
        --install option. The default service name is MySQL.
 
-     * If a service name is given, it can be followed by a single
-       option. By convention, this should be
-       --defaults-file=file_name to specify the name of an option
-       file from which the server should read options when it starts.
+     * If a service name is given, it can be followed by a
+       single option. By convention, this should be
+       --defaults-file=file_name to specify the name of an
+       option file from which the server should read options
+       when it starts.
        The use of a single option other than --defaults-file is
-       possible but discouraged. --defaults-file is more flexible
-       because it enables you to specify multiple startup options for
-       the server by placing them in the named option file.
+       possible but discouraged. --defaults-file is more
+       flexible because it enables you to specify multiple
+       startup options for the server by placing them in the
+       named option file.
 
-     * You can also specify a --local-service option following the
-       service name. This causes the server to run using the
+     * You can also specify a --local-service option following
+       the service name. This causes the server to run using the
        LocalService Windows account that has limited system
-       privileges. This account is available only for Windows XP or
-       newer. If both --defaults-file and --local-service are given
-       following the service name, they can be in any order.
-
-   For a MySQL server that is installed as a Windows service, the
-   following rules determine the service name and option files that
-   the server uses:
-
-     * If the service-installation command specifies no service name
-       or the default service name (MySQL) following the --install
-       option, the server uses the a service name of MySQL and reads
-       options from the [mysqld] group in the standard option files.
-
-     * If the service-installation command specifies a service name
-       other than MySQL following the --install option, the server
-       uses that service name. It reads options from the [mysqld]
-       group and the group that has the same name as the service in
-       the standard option files. This enables you to use the
-       [mysqld] group for options that should be used by all MySQL
-       services, and an option group with the service name for use by
-       the server installed with that service name.
+       privileges. This account is available only for Windows XP
+       or newer. If both --defaults-file and --local-service are
+       given following the service name, they can be in any
+       order.
+
+   For a MySQL server that is installed as a Windows service,
+   the following rules determine the service name and option
+   files that the server uses:
+
+     * If the service-installation command specifies no service
+       name or the default service name (MySQL) following the
+       --install option, the server uses the a service name of
+       MySQL and reads options from the [mysqld] group in the
+       standard option files.
+
+     * If the service-installation command specifies a service
+       name other than MySQL following the --install option, the
+       server uses that service name. It reads options from the
+       [mysqld] group and the group that has the same name as
+       the service in the standard option files. This enables
+       you to use the [mysqld] group for options that should be
+       used by all MySQL services, and an option group with the
+       service name for use by the server installed with that
+       service name.
 
      * If the service-installation command specifies a
        --defaults-file option after the service name, the server
-       reads options the same way as described in the previous item,
-       except that it reads options only from the named file and
-       ignores the standard option files.
+       reads options the same way as described in the previous
+       item, except that it reads options only from the named
+       file and ignores the standard option files.
 
    As a more complex example, consider the following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
           --install MySQL --defaults-file=C:\my-opts.cnf
 
    Here, the default service name (MySQL) is given after the
-   --install option. If no --defaults-file option had been given,
-   this command would have the effect of causing the server to read
-   the [mysqld] group from the standard option files. However,
-   because the --defaults-file option is present, the server reads
-   options from the [mysqld] option group, and only from the named
-   file.
+   --install option. If no --defaults-file option had been
+   given, this command would have the effect of causing the
+   server to read the [mysqld] group from the standard option
+   files. However, because the --defaults-file option is
+   present, the server reads options from the [mysqld] option
+   group, and only from the named file.
    Note
 
-   On Windows, if the server is started with the --defaults-file and
-   --install options, --install must be first. Otherwise, mysqld.exe
-   will attempt to start the MySQL server.
+   On Windows, if the server is started with the --defaults-file
+   and --install options, --install must be first. Otherwise,
+   mysqld.exe will attempt to start the MySQL server.
 
-   You can also specify options as Start parameters in the Windows
-   Services utility before you start the MySQL service.
+   You can also specify options as Start parameters in the
+   Windows Services utility before you start the MySQL service.
 
 Starting the service
 
    Once a MySQL server has been installed as a service, Windows
    starts the service automatically whenever Windows starts. The
-   service also can be started immediately from the Services utility,
-   or by using a NET START MySQL command. The NET command is not case
-   sensitive.
-
-   When run as a service, mysqld has no access to a console window,
-   so no messages can be seen there. If mysqld does not start, check
-   the error log to see whether the server wrote any messages there
-   to indicate the cause of the problem. The error log is located in
-   the MySQL data directory (for example, C:\Program
-   Files\MySQL\MySQL Server 5.5\data). It is the file with a suffix
-   of .err.
+   service also can be started immediately from the Services
+   utility, or by using a NET START MySQL command. The NET
+   command is not case sensitive.
+
+   When run as a service, mysqld has no access to a console
+   window, so no messages can be seen there. If mysqld does not
+   start, check the error log to see whether the server wrote
+   any messages there to indicate the cause of the problem. The
+   error log is located in the MySQL data directory (for
+   example, C:\Program Files\MySQL\MySQL Server 5.5\data). It is
+   the file with a suffix of .err.
 
    When a MySQL server has been installed as a service, and the
-   service is running, Windows stops the service automatically when
-   Windows shuts down. The server also can be stopped manually by
-   using the Services utility, the NET STOP MySQL command, or the
-   mysqladmin shutdown command.
+   service is running, Windows stops the service automatically
+   when Windows shuts down. The server also can be stopped
+   manually by using the Services utility, the NET STOP MySQL
+   command, or the mysqladmin shutdown command.
 
    You also have the choice of installing the server as a manual
    service if you do not wish for the service to be started
    automatically during the boot process. To do this, use the
    --install-manual option rather than the --install option:
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-m
-anual
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-ma
+nual
 
 Removing the service
 
-   To remove a server that is installed as a service, first stop it
-   if it is running by executing NET STOP MySQL. Then use the
+   To remove a server that is installed as a service, first stop
+   it if it is running by executing NET STOP MySQL. Then use the
    --remove option to remove it:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --remove
 
-   If mysqld is not running as a service, you can start it from the
-   command line. For instructions, see Section 2.3.7.5, "Starting
-   MySQL from the Windows Command Line."
-
-   Please see Section 2.3.8, "Troubleshooting a Microsoft Windows
-   MySQL Server Installation," if you encounter difficulties during
-   installation.
+   If mysqld is not running as a service, you can start it from
+   the command line. For instructions, see Section 2.3.7.5,
+   "Starting MySQL from the Windows Command Line."
+
+   If you encounter difficulties during installation. see
+   Section 2.3.8, "Troubleshooting a Microsoft Windows MySQL
+   Server Installation."
 
 2.3.7.8 Testing The MySQL Installation
 
-   You can test whether the MySQL server is working by executing any
-   of the following commands:
+   You can test whether the MySQL server is working by executing
+   any of the following commands:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow"
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root
-mysql
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root m
+ysql
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" version
- status proc
+status proc
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysql" test
 
-   If mysqld is slow to respond to TCP/IP connections from client
-   programs, there is probably a problem with your DNS. In this case,
-   start mysqld with the --skip-name-resolve option and use only
-   localhost and IP addresses in the Host column of the MySQL grant
-   tables.
-
-   You can force a MySQL client to use a named-pipe connection rather
-   than TCP/IP by specifying the --pipe or --protocol=PIPE option, or
-   by specifying . (period) as the host name. Use the --socket option
-   to specify the name of the pipe if you do not want to use the
-   default pipe name.
-
-   Note that if you have set a password for the root account, deleted
-   the anonymous account, or created a new user account, then to
-   connect to the MySQL server you must use the appropriate -u and -p
-   options with the commands shown previously. See Section 4.2.2,
-   "Connecting to the MySQL Server."
+   If mysqld is slow to respond to TCP/IP connections from
+   client programs, there is probably a problem with your DNS.
+   In this case, start mysqld with the --skip-name-resolve
+   option and use only localhost and IP addresses in the Host
+   column of the MySQL grant tables.
+
+   You can force a MySQL client to use a named-pipe connection
+   rather than TCP/IP by specifying the --pipe or
+   --protocol=PIPE option, or by specifying . (period) as the
+   host name. Use the --socket option to specify the name of the
+   pipe if you do not want to use the default pipe name.
+
+   If you have set a password for the root account, deleted the
+   anonymous account, or created a new user account, then to
+   connect to the MySQL server you must use the appropriate -u
+   and -p options with the commands shown previously. See
+   Section 4.2.2, "Connecting to the MySQL Server."
 
    For more information about mysqlshow, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information."
+   "mysqlshow --- Display Database, Table, and Column
+   Information."
 
 2.3.8 Troubleshooting a Microsoft Windows MySQL Server Installation
 
    When installing and running MySQL for the first time, you may
    encounter certain errors that prevent the MySQL server from
-   starting. The purpose of this section is to help you diagnose and
-   correct some of these errors.
+   starting. This section helps you diagnose and correct some of
+   these errors.
 
    Your first resource when troubleshooting server issues is the
    error log. The MySQL server uses the error log to record
-   information relevant to the error that prevents the server from
-   starting. The error log is located in the data directory specified
-   in your my.ini file. The default data directory location is
-   C:\Program Files\MySQL\MySQL Server 5.5\data, or
-   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008. The
-   C:\ProgramData directory is hidden by default. You need to change
-   your folder options to see the directory and contents. For more
-   information on the error log and understanding the content, see
-   Section 5.2.2, "The Error Log."
-
-   Another source of information regarding possible errors is the
-   console messages displayed when the MySQL service is starting. Use
-   the NET START MySQL command from the command line after installing
-   mysqld as a service to see any error messages regarding the
-   starting of the MySQL server as a service. See Section 2.3.7.7,
-   "Starting MySQL as a Windows Service."
-
-   The following examples show other common error messages you may
-   encounter when installing MySQL and starting the server for the
-   first time:
+   information relevant to the error that prevents the server
+   from starting. The error log is located in the data directory
+   specified in your my.ini file. The default data directory
+   location is C:\Program Files\MySQL\MySQL Server 5.5\data, or
+   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008.
+   The C:\ProgramData directory is hidden by default. You need
+   to change your folder options to see the directory and
+   contents. For more information on the error log and
+   understanding the content, see Section 5.2.2, "The Error
+   Log."
+
+   For information regarding possible errors, also consult the
+   console messages displayed when the MySQL service is
+   starting. Use the NET START MySQL command from the command
+   line after installing mysqld as a service to see any error
+   messages regarding the starting of the MySQL server as a
+   service. See Section 2.3.7.7, "Starting MySQL as a Windows
+   Service."
 
-     * If the MySQL server cannot find the mysql privileges database
-       or other critical files, you may see these messages:
+   The following examples show other common error messages you
+   might encounter when installing MySQL and starting the server
+   for the first time:
+
+     * If the MySQL server cannot find the mysql privileges
+       database or other critical files, it displays these
+       messages:
 System error 1067 has occurred.
-Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
-exist
+Fatal error: Can't open and lock privilege tables:
+Table 'mysql.user' doesn't exist
+
        These messages often occur when the MySQL base or data
        directories are installed in different locations than the
-       default locations (C:\Program Files\MySQL\MySQL Server 5.5 and
-       C:\Program Files\MySQL\MySQL Server 5.5\data, respectively).
-       This situation may occur when MySQL is upgraded and installed
-       to a new location, but the configuration file is not updated
-       to reflect the new location. In addition, there may be old and
-       new configuration files that conflict. Be sure to delete or
-       rename any old configuration files when upgrading MySQL.
+       default locations (C:\Program Files\MySQL\MySQL Server
+       5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data,
+       respectively).
+       This situation can occur when MySQL is upgraded and
+       installed to a new location, but the configuration file
+       is not updated to reflect the new location. In addition,
+       old and new configuration files might conflict. Be sure
+       to delete or rename any old configuration files when
+       upgrading MySQL.
        If you have installed MySQL to a directory other than
-       C:\Program Files\MySQL\MySQL Server 5.5, you need to ensure
-       that the MySQL server is aware of this through the use of a
-       configuration (my.ini) file. The my.ini file needs to be
-       located in your Windows directory, typically C:\WINDOWS. You
-       can determine its exact location from the value of the WINDIR
-       environment variable by issuing the following command from the
-       command prompt:
+       C:\Program Files\MySQL\MySQL Server 5.5, ensure that the
+       MySQL server is aware of this through the use of a
+       configuration (my.ini) file. Put the my.ini file in your
+       Windows directory, typically C:\WINDOWS. To determine its
+       exact location from the value of the WINDIR environment
+       variable, issue the following command from the command
+       prompt:
 C:\> echo %WINDIR%
-       An option file can be created and modified with any text
-       editor, such as Notepad. For example, if MySQL is installed in
-       E:\mysql and the data directory is D:\MySQLdata, you can
-       create the option file and set up a [mysqld] section to
-       specify values for the basedir and datadir options:
+
+       You can create or modify an option file with any text
+       editor, such as Notepad. For example, if MySQL is
+       installed in E:\mysql and the data directory is
+       D:\MySQLdata, you can create the option file and set up a
+       [mysqld] section to specify values for the basedir and
+       datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=D:/MySQLdata
-       Note that Windows path names are specified in option files
-       using (forward) slashes rather than backslashes. If you do use
-       backslashes, double them:
+
+       Microsoft Windows path names are specified in option
+       files using (forward) slashes rather than backslashes. If
+       you do use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=C:\\Program Files\\MySQL\\MySQL Server 5.5
 # set datadir to the location of your data directory
 datadir=D:\\MySQLdata
-       The rules for use of backslash in option file values are given
-       in Section 4.2.6, "Using Option Files."
-       If you change the datadir value in your MySQL configuration
-       file, you must move the contents of the existing MySQL data
-       directory before restarting the MySQL server.
+
+       The rules for use of backslash in option file values are
+       given in Section 4.2.6, "Using Option Files."
+       If you change the datadir value in your MySQL
+       configuration file, you must move the contents of the
+       existing MySQL data directory before restarting the MySQL
+       server.
        See Section 2.3.7.2, "Creating an Option File."
 
-     * If you reinstall or upgrade MySQL without first stopping and
-       removing the existing MySQL service and install MySQL using
-       the MySQL Configuration Wizard, you may see this error:
+     * If you reinstall or upgrade MySQL without first stopping
+       and removing the existing MySQL service and install MySQL
+       using the MySQL Installer, you might see this error:
 Error: Cannot create Windows service for MySql. Error: 0
-       This occurs when the Configuration Wizard tries to install the
-       service and finds an existing service with the same name.
-       One solution to this problem is to choose a service name other
-       than mysql when using the configuration wizard. This enables
-       the new service to be installed correctly, but leaves the
-       outdated service in place. Although this is harmless, it is
-       best to remove old services that are no longer in use.
+
+       This occurs when the Configuration Wizard tries to
+       install the service and finds an existing service with
+       the same name.
+       One solution to this problem is to choose a service name
+       other than mysql when using the configuration wizard.
+       This enables the new service to be installed correctly,
+       but leaves the outdated service in place. Although this
+       is harmless, it is best to remove old services that are
+       no longer in use.
        To permanently remove the old mysql service, execute the
-       following command as a user with administrative privileges, on
-       the command-line:
+       following command as a user with administrative
+       privileges, on the command line:
 C:\> sc delete mysql
 [SC] DeleteService SUCCESS
+
        If the sc utility is not available for your version of
        Windows, download the delsrv utility from
-       http://www.microsoft.com/windows2000/techinfo/reskit/tools/exi
-       sting/delsrv-o.asp and use the delsrv mysql syntax.
+       http://www.microsoft.com/windows2000/techinfo/reskit/tool
+       s/existing/delsrv-o.asp and use the delsrv mysql syntax.
 
 2.3.9 Upgrading MySQL on Windows
 
@@ -3613,93 +4057,135 @@ C:\> sc delete mysql
        information on upgrading MySQL that is not specific to
        Windows.
 
-    2. You should always back up your current MySQL installation
-       before performing an upgrade. See Section 7.2, "Database
-       Backup Methods."
+    2. Always back up your current MySQL installation before
+       performing an upgrade. See Section 7.2, "Database Backup
+       Methods."
 
     3. Download the latest Windows distribution of MySQL from
        http://dev.mysql.com/downloads/.
 
-    4. Before upgrading MySQL, you must stop the server. If the
-       server is installed as a service, stop the service with the
+    4. Before upgrading MySQL, stop the server. If the server is
+       installed as a service, stop the service with the
        following command from the command prompt:
 C:\> NET STOP MySQL
+
        If you are not running the MySQL server as a service, use
        mysqladmin to stop it. For example, before upgrading from
-       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as follows:
+       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as
+       follows:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.1\bin\mysqladmin" -u root
- shutdown
+shutdown
+
        Note
-       If the MySQL root user account has a password, you need to
-       invoke mysqladmin with the -p option and enter the password
-       when prompted.
-
-    5. Before upgrading a MySQL service from MySQL 5.1 to 5.5, you
-       should stop the 5.1 server and remove the instance. Run the
-       MySQL Instance Configuration Wizard, choose the Remove
-       Instance option and in the next screen, confirm removal. After
-       that it is safe to uninstall MySQL Server 5.1.
-
-    6. Before upgrading to MySQL 5.5 from a version previous to
-       4.1.5, or from a version of MySQL installed from a Zip archive
-       to a version of MySQL installed with the MySQL Installation
-       Wizard, you must first manually remove the previous
-       installation and MySQL service (if the server is installed as
-       a service).
+       If the MySQL root user account has a password, invoke
+       mysqladmin with the -p option and enter the password when
+       prompted.
+
+    5. Before upgrading to MySQL 5.5 from a version previous to
+       4.1.5, or from a version of MySQL installed from a Zip
+       archive to a version of MySQL installed with the MySQL
+       Installation Wizard, you must first manually remove the
+       previous installation and MySQL service (if the server is
+       installed as a service).
        To remove the MySQL service, use the following command:
 C:\> C:\mysql\bin\mysqld --remove
+
        If you do not remove the existing service, the MySQL
-       Installation Wizard may fail to properly install the new MySQL
-       service.
+       Installation Wizard may fail to properly install the new
+       MySQL service.
 
-    7. If you are using the MySQL Installation Wizard, start the
+    6. If you are using the MySQL Installer, start it as
+       described in Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+       If you are using the MySQL Installation Wizard, start the
        wizard as described in Section 2.3.5.1, "Using the MySQL
        Installation Wizard."
 
-    8. If you are installing MySQL from a Zip archive, extract the
-       archive. You may either overwrite your existing MySQL
-       installation (usually located at C:\mysql), or install it into
-       a different directory, such as C:\mysql5. Overwriting the
-       existing installation is recommended.
-
-    9. If you were running MySQL as a Windows service and you had to
-       remove the service earlier in this procedure, reinstall the
-       service. (See Section 2.3.7.7, "Starting MySQL as a Windows
-       Service.")
-   10. Restart the server. For example, use NET START MySQL if you
-       run MySQL as a service, or invoke mysqld directly otherwise.
-   11. As Administrator, run mysql_upgrade to check your tables,
-       attempt to repair them if necessary, and update your grant
-       tables if they have changed so that you can take advantage of
-       any new capabilities. See Section 4.4.7, "mysql_upgrade ---
-       Check and Upgrade MySQL Tables."
-   12. If you encounter errors, see Section 2.3.8, "Troubleshooting a
-       Microsoft Windows MySQL Server Installation."
+    7. If you are upgrading MySQL from a Zip archive, extract
+       the archive. You may either overwrite your existing MySQL
+       installation (usually located at C:\mysql), or install it
+       into a different directory, such as C:\mysql5.
+       Overwriting the existing installation is recommended.
+       However, for upgrades (as opposed to installing for the
+       first time), you must remove the data directory from your
+       existing MySQL installation to avoid replacing your
+       current data files. To do so, follow these steps:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Rezip the Zip archive
+         d. Unzip the modified Zip archive on top of your
+            existing installation
+       Alternatively:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Move the data directory from the current MySQL
+            installation to the location of the just-removed
+            data directory
+         d. Remove the current MySQL installation
+         e. Move the unzipped installation to the location of
+            the just-removed installation
+
+    8. If you were running MySQL as a Windows service and you
+       had to remove the service earlier in this procedure,
+       reinstall the service. (See Section 2.3.7.7, "Starting
+       MySQL as a Windows Service.")
+
+    9. Restart the server. For example, use NET START MySQL if
+       you run MySQL as a service, or invoke mysqld directly
+       otherwise.
+   10. As Administrator, run mysql_upgrade to check your tables,
+       attempt to repair them if necessary, and update your
+       grant tables if they have changed so that you can take
+       advantage of any new capabilities. See Section 4.4.7,
+       "mysql_upgrade --- Check and Upgrade MySQL Tables."
+   11. If you encounter errors, see Section 2.3.8,
+       "Troubleshooting a Microsoft Windows MySQL Server
+       Installation."
 
 2.3.10 Windows Postinstallation Procedures
 
-   On Windows, you need not create the data directory and the grant
-   tables. MySQL Windows distributions include the grant tables with
-   a set of preinitialized accounts in the mysql database under the
-   data directory. Regarding passwords, if you installed MySQL using
-   the Windows Installation Wizard, you may have already assigned
-   passwords to the accounts. (See Section 2.3.5.1, "Using the MySQL
-   Installation Wizard.") Otherwise, use the password-assignment
-   procedure given in Section 2.10.2, "Securing the Initial MySQL
+   GUI tools exist that perform most of the tasks described
+   below, including:
+
+     * MySQL Installer: Used to install and upgrade MySQL
+       products.
+
+     * MySQL Workbench: Manages the MySQL server and edits SQL
+       queries.
+
+     * MySQL Notifier: Starts, stops, or restarts the MySQL
+       server, and monitors its status.
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html):
+       Edits MySQL data with Microsoft Excel.
+
+   On Windows, you need not create the data directory and the
+   grant tables. MySQL Windows distributions include the grant
+   tables with a set of preinitialized accounts in the mysql
+   database under the data directory. Regarding passwords, if
+   you installed MySQL using the MySQL Installer, you may have
+   already assigned passwords to the accounts. (See Section
+   2.3.3, "Installing MySQL on Microsoft Windows Using MySQL
+   Installer.") Otherwise, use the password-assignment procedure
+   given in Section 2.10.2, "Securing the Initial MySQL
    Accounts."
 
-   Before setting up passwords, you might want to try running some
-   client programs to make sure that you can connect to the server
-   and that it is operating properly. Make sure that the server is
-   running (see Section 2.3.7.4, "Starting the Server for the First
-   Time"), and then issue the following commands to verify that you
-   can retrieve information from the server. You may need to specify
-   directory different from C:\mysql\bin on the command line. If you
-   used the Windows Installation Wizard, the default directory is
-   C:\Program Files\MySQL\MySQL Server 5.5, and the mysql and
-   mysqlshow client programs are in C:\Program Files\MySQL\MySQL
-   Server 5.5\bin. See Section 2.3.5.1, "Using the MySQL Installation
-   Wizard," for more information.
+   Before setting up passwords, you might want to try running
+   some client programs to make sure that you can connect to the
+   server and that it is operating properly. Make sure that the
+   server is running (see Section 2.3.7.4, "Starting the Server
+   for the First Time"), and then issue the following commands
+   to verify that you can retrieve information from the server.
+   You may need to specify directory different from C:\mysql\bin
+   on the command line. If you installed MySQL using MySQL
+   Installer, the default directory is C:\Program
+   Files\MySQL\MySQL Server 5.5, and the mysql and mysqlshow
+   client programs are in C:\Program Files\MySQL\MySQL Server
+   5.5\bin. See Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer," for more information.
 
    Use mysqlshow to see what databases exist:
 C:\> C:\mysql\bin\mysqlshow
@@ -3711,20 +4197,22 @@ C:\> C:\mysql\bin\mysqlshow
 | test               |
 +--------------------+
 
-   The list of installed databases may vary, but will always include
-   the minimum of mysql and information_schema. In most cases, the
-   test database will also be installed automatically.
-
-   The preceding command (and commands for other MySQL programs such
-   as mysql) may not work if the correct MySQL account does not
-   exist. For example, the program may fail with an error, or you may
-   not be able to view all databases. If you installed using the MSI
-   packages and used the MySQL Server Instance Config Wizard, then
-   the root user will have been created automatically with the
-   password you supplied. In this case, you should use the -u root
-   and -p options. (You will also need to use the -u root and -p
-   options if you have already secured the initial MySQL accounts.)
-   With -p, you will be prompted for the root password. For example:
+   The list of installed databases may vary, but will always
+   include the minimum of mysql and information_schema. In most
+   cases, the test database will also be installed
+   automatically.
+
+   The preceding command (and commands for other MySQL programs
+   such as mysql) may not work if the correct MySQL account does
+   not exist. For example, the program may fail with an error,
+   or you may not be able to view all databases. If you
+   installed MySQL using MySQL Installer, then the root user
+   will have been created automatically with the password you
+   supplied. In this case, you should use the -u root and -p
+   options. (You will also need to use the -u root and -p
+   options if you have already secured the initial MySQL
+   accounts.) With -p, you will be prompted for the root
+   password. For example:
 C:\> C:\mysql\bin\mysqlshow -u root -p
 Enter password: (enter root password here)
 +--------------------+
@@ -3735,8 +4223,8 @@ Enter password: (enter root password her
 | test               |
 +--------------------+
 
-   If you specify a database name, mysqlshow displays a list of the
-   tables within the database:
+   If you specify a database name, mysqlshow displays a list of
+   the tables within the database:
 C:\> C:\mysql\bin\mysqlshow mysql
 Database: mysql
 +---------------------------+
@@ -3764,8 +4252,8 @@ Database: mysql
 | user                      |
 +---------------------------+
 
-   Use the mysql program to select information from a table in the
-   mysql database:
+   Use the mysql program to select information from a table in
+   the mysql database:
 C:\> C:\mysql\bin\mysql -e "SELECT Host,Db,User FROM mysql.db"
 +------+--------+------+
 | host | db     | user |
@@ -3774,66 +4262,77 @@ C:\> C:\mysql\bin\mysql -e "SELECT Host,
 | %    | test_% |      |
 +------+--------+------+
 
-   For more information about mysqlshow and mysql, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information,"
-   and Section 4.5.1, "mysql --- The MySQL Command-Line Tool."
-
-   If you are running a version of Windows that supports services,
-   you can set up the MySQL server to run automatically when Windows
-   starts. See Section 2.3.7.7, "Starting MySQL as a Windows
-   Service."
+   For more information about mysqlshow and mysql, see Section
+   4.5.6, "mysqlshow --- Display Database, Table, and Column
+   Information," and Section 4.5.1, "mysql --- The MySQL
+   Command-Line Tool."
+
+   If you are running a version of Windows that supports
+   services, you can set up the MySQL server to run
+   automatically when Windows starts. See Section 2.3.7.7,
+   "Starting MySQL as a Windows Service."
 
 2.4 Installing MySQL on Mac OS X
 
-   For a list of supported Mac OS X versions that the MySQL server
-   supports, see
-   http://www.mysql.com/support/supportedplatforms/database.html.
-
-   MySQL for Mac OS X is available in a number of different forms:
-
-     * Native Package Installer format, which uses the native Mac OS
-       X installer (DMG) to walk you through the installation of
-       MySQL. For more information, see Section 2.4.2, "Installing
-       MySQL on Mac OS X Using Native Packages." You can use the
-       package installer with Mac OS X 10.6 and later, and the
-       package is available for both 32-bit and 64-bit architectures.
-       The user you use to perform the installation must have
-       administrator privileges.
-
-     * Tar package format, which uses a file packaged using the Unix
-       tar and gzip commands. To use this method, you will need to
-       open a Terminal window. You do not need administrator
-       privileges using this method, as you can install the MySQL
-       server anywhere using this method. For more information on
-       using this method, you can use the generic instructions for
-       using a tarball, Section 2.2, "Installing MySQL on Unix/Linux
-       Using Generic Binaries."You can use the package installer with
-       Mac OS X 10.6 and later, and available for both 32-bit and
-       64-bit architectures.
-       In addition to the core installation, the Package Installer
-       also includes Section 2.4.3, "Installing the MySQL Startup
-       Item" and Section 2.4.4, "Installing and Using the MySQL
-       Preference Pane," both of which simplify the management of
-       your installation.
-
-     * Mac OS X server includes a version of MySQL as standard. If
-       you want to use a more recent version than that supplied with
-       the Mac OS X server release, you can make use of the package
-       or tar formats. For more information on using the MySQL
-       bundled with Mac OS X, see Section 2.4.5, "Using the Bundled
-       MySQL on Mac OS X Server."
+   For a list of supported Mac OS X versions that the MySQL
+   server supports, see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
+
+   MySQL for Mac OS X is available in a number of different
+   forms:
+
+     * Native Package Installer format, which uses the native
+       Mac OS X installer (DMG) to walk you through the
+       installation of MySQL. For more information, see Section
+       2.4.2, "Installing MySQL on Mac OS X Using Native
+       Packages." You can use the package installer with Mac OS
+       X 10.6 and later, and the package is available for both
+       32-bit and 64-bit architectures. The user you use to
+       perform the installation must have administrator
+       privileges.
 
-   For additional information on using MySQL on Mac OS X, see Section
-   2.4.1, "General Notes on Installing MySQL on Mac OS X."
+     * Tar package format, which uses a file packaged using the
+       Unix tar and gzip commands. To use this method, you will
+       need to open a Terminal window. You do not need
+       administrator privileges using this method, as you can
+       install the MySQL server anywhere using this method. For
+       more information on using this method, you can use the
+       generic instructions for using a tarball, Section 2.2,
+       "Installing MySQL on Unix/Linux Using Generic
+       Binaries."You can use the package installer with Mac OS X
+       10.6 and later, and available for both 32-bit and 64-bit
+       architectures.
+       In addition to the core installation, the Package
+       Installer also includes Section 2.4.4, "Installing the
+       MySQL Startup Item" and Section 2.4.5, "Installing and
+       Using the MySQL Preference Pane," both of which simplify
+       the management of your installation.
+
+     * Mac OS X server includes a version of MySQL as standard.
+       If you want to use a more recent version than that
+       supplied with the Mac OS X server release, you can make
+       use of the package or tar formats. For more information
+       on using the MySQL bundled with Mac OS X, see Section
+       2.4.6, "Using the Bundled MySQL on Mac OS X Server."
+
+   For additional information on using MySQL on Mac OS X, see
+   Section 2.4.1, "General Notes on Installing MySQL on Mac OS
+   X."
 
 2.4.1 General Notes on Installing MySQL on Mac OS X
 
    You should keep the following issues and notes in mind:
 
-     * The default location for the MySQL Unix socket is different on
-       Mac OS X and Mac OS X Server depending on the installation
-       type you chose. The following table shows the default
-       locations by installation type.
+     * OS X 10.4 deprecated startup items in favor of launchd
+       daemons, and as of OS X 10.10 (Yosemite), startup items
+       do not function. For these reasons, using launchd daemons
+       is preferred over startup items.
+
+     * The default location for the MySQL Unix socket is
+       different on Mac OS X and Mac OS X Server depending on
+       the installation type you chose. The following table
+       shows the default locations by installation type.
        Table 2.8 MySQL Unix Socket Locations on Mac OS X by
        Installation Type
 
@@ -3841,90 +4340,103 @@ C:\> C:\mysql\bin\mysql -e "SELECT Host,
        Package Installer from MySQL       /tmp/mysql.sock
        Tarball from MySQL                 /tmp/mysql.sock
        MySQL Bundled with Mac OS X Server /var/mysql/mysql.sock
-       To prevent issues, you should either change the configuration
-       of the socket used within your application (for example,
-       changing php.ini), or you should configure the socket location
-       using a MySQL configuration file and the socket option. For
-       more information, see Section 5.1.3, "Server Command Options."
-
-     * You may need (or want) to create a specific mysql user to own
-       the MySQL directory and data. You can do this through the
-       Directory Utility, and the mysql user should already exist.
-       For use in single user mode, an entry for _mysql (note the
-       underscore prefix) should already exist within the system
-       /etc/passwd file.
+       To prevent issues, you should either change the
+       configuration of the socket used within your application
+       (for example, changing php.ini), or you should configure
+       the socket location using a MySQL configuration file and
+       the socket option. For more information, see Section
+       5.1.3, "Server Command Options."
+
+     * You may need (or want) to create a specific mysql user to
+       own the MySQL directory and data. You can do this through
+       the Directory Utility, and the mysql user should already
+       exist. For use in single user mode, an entry for _mysql
+       (note the underscore prefix) should already exist within
+       the system /etc/passwd file.
 
      * If you get an "insecure startup item disabled" error when
        MySQL launches, use the following procedure. Adjust the
        pathnames appropriately for your system.
 
-         1. Modify the mysql.script using this command (enter it on a
-            single line):
+         1. Modify the mysql.script using this command (enter it
+            on a single line):
 shell> sudo /Applications/TextEdit.app/Contents/MacOS/TextEdit
   /usr/local/mysql/support-files/mysql.server
 
-         2. Locate the option file that defines the basedir value and
-            modify it to contain these lines:
+
+         2. Locate the option file that defines the basedir
+            value and modify it to contain these lines:
 basedir=/usr/local/mysql
 datadir=/usr/local/mysql/data
-            In the /Library/StartupItems/MySQLCOM/ directory, make
-            the following group ID changes from staff to wheel:
+
+            In the /Library/StartupItems/MySQLCOM/ directory,
+            make the following group ID changes from staff to
+            wheel:
 shell> sudo chgrp wheel MySQLCOM StartupParameters.plist
 
-         3. Start the server from System Preferences or Terminal.app.
 
-     * Because the MySQL package installer installs the MySQL
-       contents into a version and platform specific directory, you
-       can use this to upgrade and migrate your database between
-       versions. You will need to either copy the data directory from
-       the old version to the new version, or alternatively specify
-       an alternative datadir value to set location of the data
-       directory.
+         3. Start the server from System Preferences or
+            Terminal.app.
 
-     * You might want to add aliases to your shell's resource file to
-       make it easier to access commonly used programs such as mysql
-       and mysqladmin from the command line. The syntax for bash is:
+     * Because the MySQL package installer installs the MySQL
+       contents into a version and platform specific directory,
+       you can use this to upgrade and migrate your database
+       between versions. You will need to either copy the data
+       directory from the old version to the new version, or
+       alternatively specify an alternative datadir value to set
+       location of the data directory.
+
+     * You might want to add aliases to your shell's resource
+       file to make it easier to access commonly used programs
+       such as mysql and mysqladmin from the command line. The
+       syntax for bash is:
 alias mysql=/usr/local/mysql/bin/mysql
 alias mysqladmin=/usr/local/mysql/bin/mysqladmin
+
        For tcsh, use:
 alias mysql /usr/local/mysql/bin/mysql
 alias mysqladmin /usr/local/mysql/bin/mysqladmin
-       Even better, add /usr/local/mysql/bin to your PATH environment
-       variable. You can do this by modifying the appropriate startup
-       file for your shell. For more information, see Section 4.2.1,
-       "Invoking MySQL Programs."
-
-     * After you have copied over the MySQL database files from the
-       previous installation and have successfully started the new
-       server, you should consider removing the old installation
-       files to save disk space. Additionally, you should also remove
-       older versions of the Package Receipt directories located in
+
+       Even better, add /usr/local/mysql/bin to your PATH
+       environment variable. You can do this by modifying the
+       appropriate startup file for your shell. For more
+       information, see Section 4.2.1, "Invoking MySQL
+       Programs."
+
+     * After you have copied over the MySQL database files from
+       the previous installation and have successfully started
+       the new server, you should consider removing the old
+       installation files to save disk space. Additionally, you
+       should also remove older versions of the Package Receipt
+       directories located in
        /Library/Receipts/mysql-VERSION.pkg.
 
 2.4.2 Installing MySQL on Mac OS X Using Native Packages
 
-   The package is located inside a disk image (.dmg) file that you
-   first need to mount by double-clicking its icon in the Finder. It
-   should then mount the image and display its contents.
+   The package is located inside a disk image (.dmg) file that
+   you first need to mount by double-clicking its icon in the
+   Finder. It should then mount the image and display its
+   contents.
    Note
 
    Before proceeding with the installation, be sure to stop all
-   running MySQL server instances by using either the MySQL Manager
-   Application (on Mac OS X Server) or mysqladmin shutdown on the
-   command line.
-
-   When installing from the package version, you should also install
-   the MySQL Preference Pane, which will enable you to control the
-   startup and execution of your MySQL server from System
-   Preferences. For more information, see Section 2.4.4, "Installing
-   and Using the MySQL Preference Pane."
+   running MySQL server instances by using either the MySQL
+   Manager Application (on Mac OS X Server) or mysqladmin
+   shutdown on the command line.
+
+   When installing from the package version, you should also
+   install the MySQL Preference Pane, which will enable you to
+   control the startup and execution of your MySQL server from
+   System Preferences. For more information, see Section 2.4.5,
+   "Installing and Using the MySQL Preference Pane."
 
    When installing using the package installer, the files are
-   installed into a directory within /usr/local matching the name of
-   the installation version and platform. For example, the installer
-   file mysql-5.5-osx10.7-x86_64.dmg installs MySQL into
-   /usr/local/mysql-5.5-osx10.7-x86_64/ . The following table shows
-   the layout of the installation directory.
+   installed into a directory within /usr/local matching the
+   name of the installation version and platform. For example,
+   the installer file mysql-5.5-osx10.7-x86_64.dmg installs
+   MySQL into /usr/local/mysql-5.5-osx10.7-x86_64/ . The
+   following table shows the layout of the installation
+   directory.
 
    Table 2.9 MySQL Installation Layout on Mac OS X
    Directory Contents of Directory
@@ -3948,64 +4460,126 @@ alias mysqladmin /usr/local/mysql/bin/my
    created during installation will be created automatically.
 
     1. Download and open the MySQL package installer, which is
-       provided on a disk image (.dmg) that includes the main MySQL
-       installation package, the MySQLStartupItem.pkg installation
-       package, and the MySQL.prefPane. Double-click the disk image
-       to open it.
-       Figure 2.31 MySQL Package Installer: DMG Contents
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package, the MySQLStartupItem.pkg
+       installation package, and the MySQL.prefPane.
+       Double-click the disk image to open it.
+       Figure 2.41 MySQL Package Installer: DMG Contents
        MySQL Package Installer: DMG Contents
 
-    2. Double-click the MySQL installer package. It will be named
-       according to the version of MySQL you have downloaded. For
-       example, if you have downloaded MySQL server 5.5.41,
-       double-click mysql-5.5.41-osx-10.7-x86_64.pkg.
-
-    3. You will be presented with the opening installer dialog. Click
-       Continue to begin installation.
-       Figure 2.32 MySQL Package Installer: Introduction
+    2. Double-click the MySQL installer package. It will be
+       named according to the version of MySQL you have
+       downloaded. For example, if you have downloaded MySQL
+       server 5.5.42, double-click
+       mysql-5.5.42-osx-10.7-x86_64.pkg.
+
+    3. You will be presented with the opening installer dialog.
+       Click Continue to begin installation.
+       Figure 2.42 MySQL Package Installer: Introduction
        MySQL Package Installer: Introduction
 
-    4. A copy of the installation instructions and other important
-       information relevant to this installation are displayed. Click
-       Continue .
-
-    5. If you have downloaded the community version of MySQL, you
-       will be shown a copy of the relevant GNU General Public
-       License. Click Continue .
-
-    6. Select the drive you want to use to install the MySQL Startup
-       Item. The drive must have a valid, bootable, Mac OS X
-       operating system installed. Click Continue.
-       Figure 2.33 MySQL Package Installer: Choose your Hard drive
+    4. A copy of the installation instructions and other
+       important information relevant to this installation are
+       displayed. Click Continue .
+
+    5. If you have downloaded the community version of MySQL,
+       you will be shown a copy of the relevant GNU General
+       Public License. Click Continue .
+
+    6. Select the drive you want to use to install the MySQL
+       Startup Item. The drive must have a valid, bootable, Mac
+       OS X operating system installed. Click Continue.
+       Figure 2.43 MySQL Package Installer: Choose your Hard
+       drive
        MySQL Package Installer: Choose your Hard drive
 
-    7. You will be asked to confirm the details of the installation,
-       including the space required for the installation. To change
-       the drive on which the MySQL server is installed, click either
-       Go Back or Change Install Location.... To install the MySQL
-       server, click Install.
-
-    8. Once the installation has been completed successfully, you
-       will be shown an Install Succeeded message.
-
-   For convenience, you may also want to install the startup item and
-   preference pane. See Section 2.4.3, "Installing the MySQL Startup
-   Item," and Section 2.4.4, "Installing and Using the MySQL
-   Preference Pane."
+    7. You will be asked to confirm the details of the
+       installation, including the space required for the
+       installation. To change the drive on which the MySQL
+       server is installed, click either Go Back or Change
+       Install Location.... To install the MySQL server, click
+       Install.
+
+    8. Once the installation has been completed successfully,
+       you will be shown an Install Succeeded message.
+
+   For convenience, you may also want to install the startup
+   item and preference pane. See Section 2.4.4, "Installing the
+   MySQL Startup Item," and Section 2.4.5, "Installing and Using
+   the MySQL Preference Pane."
+
+2.4.3 Installing a MySQL Launch Daemon
+
+   OS X uses launch daemons to automatically start, stop, and
+   manage processes and applications such as MySQL. Using launch
+   daemons is recommended over startup items on OS X.
+   Note
+
+   OS X 10.4 deprecated startup items in favor of launchd
+   daemons, and as of OS X 10.10 (Yosemite), startup items do
+   not function. For these reasons, using launchd daemons is
+   preferred over startup items.
+
+   Here is an example launchd file that starts MySQL:
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>KeepAlive</key>
+    <true/>
+    <key>Label</key>
+    <string>com.mysql.mysqld</string>
+    <key>ProgramArguments</key>
+    <array>
+    <string>/usr/local/mysql/bin/mysqld_safe</string>
+    <string>--user=mysql</string>
+    </array>
+  </dict>
+</plist>
+
+
+   Adjust the ProgramArguments array according to your system,
+   as for example your path to mysqld_safe might be different.
+   After making the proper adjustments, do the following:
+
+     * Save the XML as a file named
+       /Library/LaunchDaemons/com.mysql.mysql.plist
+
+     * Adjust the file permissions using the Apple recommended
+       owner "root", owning group "wheel", and file permissions
+       "644"
+shell> sudo chown root:wheel /Library/LaunchDaemons/com.mysql.mysql.pl
+ist
+shell> sudo chmod 644 /Library/LaunchDaemons/com.mysql.mysql.plist
+
+
+     * Enable this new MySQL service
+shell> sudo launchctl load -w /Library/LaunchDaemons/com.mysql.mysql.p
+list
 
-2.4.3 Installing the MySQL Startup Item
+   The MySQL daemon is now running, and automatically starts
+   when your system is rebooted.
 
-   The MySQL Installation Package includes a startup item that can be
-   used to automatically start and stop MySQL.
+2.4.4 Installing the MySQL Startup Item
+
+   The MySQL Installation Package includes a startup item that
+   can be used to automatically start and stop MySQL.
+   Important
+
+   Startup items are deprecated in favor of launchd daemons. For
+   additional information, see Section 2.4.3, "Installing a
+   MySQL Launch Daemon."
 
    To install the MySQL Startup Item:
 
     1. Download and open the MySQL package installer, which is
-       provided on a disk image (.dmg) that includes the main MySQL
-       installation package, the MySQLStartupItem.pkg installation
-       package, and the MySQL.prefPane. Double-click the disk image
-       to open it.
-       Figure 2.34 MySQL Package Installer: DMG Contents
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package, the MySQLStartupItem.pkg
+       installation package, and the MySQL.prefPane.
+       Double-click the disk image to open it.
+       Figure 2.44 MySQL Package Installer: DMG Contents
        MySQL Package Installer: DMG Contents
 
     2. Double-click the MySQLStartItem.pkg file to start the
@@ -4013,134 +4587,139 @@ alias mysqladmin /usr/local/mysql/bin/my
 
     3. You will be presented with the Install MySQL Startup Item
        dialog.
-       Figure 2.35 MySQL Startup Item Installer: Introduction
+       Figure 2.45 MySQL Startup Item Installer: Introduction
        MySQL Startup Item Installer: Introduction
        Click Continue to continue the installation process.
 
-    4. A copy of the installation instructions and other important
-       information relevant to this installation are displayed. Click
-       Continue .
-
-    5. Select the drive you want to use to install the MySQL Startup
-       Item. The drive must have a valid, bootable, Mac OS X
-       operating system installed. Click Continue.
-       Figure 2.36 MySQL Startup Item Installer: Choose Your Hard
-       drive
+    4. A copy of the installation instructions and other
+       important information relevant to this installation are
+       displayed. Click Continue .
+
+    5. Select the drive you want to use to install the MySQL
+       Startup Item. The drive must have a valid, bootable, Mac
+       OS X operating system installed. Click Continue.
+       Figure 2.46 MySQL Startup Item Installer: Choose Your
+       Hard drive
        MySQL Startup Item Installer: Choose Your Hard drive
 
-    6. You will be asked to confirm the details of the installation.
-       To change the drive on which the startup item is installed,
-       click either Go Back or Change Install Location.... To install
-       the startup item, click Install.
-
-    7. Once the installation has been completed successfully, you
-       will be shown an Install Succeeded message.
-       Figure 2.37 MySQL Startup Item Installer: Summary
+    6. You will be asked to confirm the details of the
+       installation. To change the drive on which the startup
+       item is installed, click either Go Back or Change Install
+       Location.... To install the startup item, click Install.
+
+    7. Once the installation has been completed successfully,
+       you will be shown an Install Succeeded message.
+       Figure 2.47 MySQL Startup Item Installer: Summary
        MySQL Startup Item Installer: Summary
 
    The Startup Item for MySQL is installed into
-   /Library/StartupItems/MySQLCOM. The Startup Item installation adds
-   a variable MYSQLCOM=-YES- to the system configuration file
-   /etc/hostconfig. If you want to disable the automatic startup of
-   MySQL, change this variable to MYSQLCOM=-NO-.
-   Note
-
-   Deselecting Automatically Start MySQL Server on Startup from the
-   MySQL Preference Pane sets the MYSQLCOM variable to -NO-.
-
-   After the installation, you can start and stop the MySQL server
-   from the MySQL Preference Pane (preferred), or by running the
-   following commands in a terminal window. You must have
-   administrator privileges to perform these tasks, and you may be
-   prompted for your password.
+   /Library/StartupItems/MySQLCOM. The Startup Item installation
+   adds a variable MYSQLCOM=-YES- to the system configuration
+   file /etc/hostconfig. If you want to disable the automatic
+   startup of MySQL, change this variable to MYSQLCOM=-NO-.
+   Note
+
+   Deselecting Automatically Start MySQL Server on Startup from
+   the MySQL Preference Pane sets the MYSQLCOM variable to -NO-.
+
+   After the installation, you can start and stop the MySQL
+   server from the MySQL Preference Pane (preferred), or by
+   running the following commands in a terminal window. You must
+   have administrator privileges to perform these tasks, and you
+   may be prompted for your password.
 
-   If you have installed the Startup Item, use this command to start
-   the server:
+   If you have installed the Startup Item, use this command to
+   start the server:
 shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM start
 
-   If you have installed the Startup Item, use this command to stop
-   the server:
+   If you have installed the Startup Item, use this command to
+   stop the server:
 shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM stop
 
-2.4.4 Installing and Using the MySQL Preference Pane
+2.4.5 Installing and Using the MySQL Preference Pane
 
    The MySQL Package installer disk image also includes a custom
-   MySQL Preference Pane that enables you to start, stop, and control
-   automated startup during boot of your MySQL installation.
+   MySQL Preference Pane that enables you to start, stop, and
+   control automated startup during boot of your MySQL
+   installation.
 
    To install the MySQL Preference Pane:
 
-    1. Download and open the MySQL package installer package, which
-       is provided on a disk image (.dmg) that includes the main
-       MySQL installation package, the MySQLStartupItem.pkg
-       installation package, and the MySQL.prefPane. Double-click the
-       disk image to open it.
-       Figure 2.38 MySQL Package Installer: DMG Contents
+    1. Download and open the MySQL package installer package,
+       which is provided on a disk image (.dmg) that includes
+       the main MySQL installation package, the
+       MySQLStartupItem.pkg installation package, and the
+       MySQL.prefPane. Double-click the disk image to open it.
+       Figure 2.48 MySQL Package Installer: DMG Contents
        MySQL Package Installer: DMG Contents
 
-    2. Double-click the MySQL.prefPane. The MySQL System Preferences
-       will open.
+    2. Double-click the MySQL.prefPane. The MySQL System
+       Preferences will open.
 
-    3. If this is the first time you have installed the preference
-       pane, you will be asked to confirm installation and whether
-       you want to install the preference pane for all users, or only
-       the current user. To install the preference pane for all users
-       you will need administrator privileges. If necessary, you will
-       be prompted for the username and password for a user with
+    3. If this is the first time you have installed the
+       preference pane, you will be asked to confirm
+       installation and whether you want to install the
+       preference pane for all users, or only the current user.
+       To install the preference pane for all users you will
+       need administrator privileges. If necessary, you will be
+       prompted for the username and password for a user with
        administrator privileges.
 
-    4. If you already have the MySQL Preference Pane installed, you
-       will be asked to confirm whether you want to overwrite the
-       existing MySQL Preference Pane.
+    4. If you already have the MySQL Preference Pane installed,
+       you will be asked to confirm whether you want to
+       overwrite the existing MySQL Preference Pane.
 
    Note
 
-   The MySQL Preference Pane only starts and stops MySQL installation
-   installed from the MySQL package installation that have been
-   installed in the default location.
+   The MySQL Preference Pane only starts and stops MySQL
+   installation installed from the MySQL package installation
+   that have been installed in the default location.
 
-   Once the MySQL Preference Pane has been installed, you can control
-   your MySQL server instance using the preference pane. To use the
-   preference pane, open the System Preferences... from the Apple
-   menu. Select the MySQL preference pane by clicking the MySQL logo
-   within the Other section of the preference panes list.
+   Once the MySQL Preference Pane has been installed, you can
+   control your MySQL server instance using the preference pane.
+   To use the preference pane, open the System Preferences...
+   from the Apple menu. Select the MySQL preference pane by
+   clicking the MySQL logo within the Other section of the
+   preference panes list.
 
-   Figure 2.39 MySQL Preference Pane: Location
+   Figure 2.49 MySQL Preference Pane: Location
    MySQL Preference Pane: Location
 
-   The MySQL Preference Pane shows the current status of the MySQL
-   server, showing stopped (in red) if the server is not running and
-   running (in green) if the server has already been started. The
-   preference pane also shows the current setting for whether the
-   MySQL server has been set to start automatically.
-
-     * To start the MySQL server using the preference pane: 
-       Click Start MySQL Server. You may be prompted for the username
-       and password of a user with administrator privileges to start
-       the MySQL server.
-
-     * To stop the MySQL server using the preference pane: 
-       Click Stop MySQL Server. You may be prompted for the username
-       and password of a user with administrator privileges to stop
-       the MySQL server.
-
-     * To automatically start the MySQL server when the system boots:
-       Check the check box next to Automatically Start MySQL Server
-       on Startup.
+   The MySQL Preference Pane shows the current status of the
+   MySQL server, showing stopped (in red) if the server is not
+   running and running (in green) if the server has already been
+   started. The preference pane also shows the current setting
+   for whether the MySQL server has been set to start
+   automatically.
+
+     * To start the MySQL server using the preference pane:
+       Click Start MySQL Server. You may be prompted for the
+       username and password of a user with administrator
+       privileges to start the MySQL server.
+
+     * To stop the MySQL server using the preference pane:
+       Click Stop MySQL Server. You may be prompted for the
+       username and password of a user with administrator
+       privileges to stop the MySQL server.
+
+     * To automatically start the MySQL server when the system
+       boots:
+       Check the check box next to Automatically Start MySQL
+       Server on Startup.
 
      * To disable automatic MySQL server startup when the system
        boots:
-       Uncheck the check box next to Automatically Start MySQL Server
-       on Startup.
+       Uncheck the check box next to Automatically Start MySQL
+       Server on Startup.
 
    You can close the System Preferences... window once you have
    completed your settings.
 
-2.4.5 Using the Bundled MySQL on Mac OS X Server
+2.4.6 Using the Bundled MySQL on Mac OS X Server
 
    If you are running Mac OS X Server, a version of MySQL should
-   already be installed. The following table shows the versions of
-   MySQL that ship with Mac OS X Server versions.
+   already be installed. The following table shows the versions
+   of MySQL that ship with Mac OS X Server versions.
 
    Table 2.10 MySQL Versions Preinstalled with Mac OS X Server
    Mac OS X Server Version MySQL Version
@@ -4152,8 +4731,8 @@ shell> sudo /Library/StartupItems/MySQLC
    10.5.0                  5.0.45
    10.6.0                  5.0.82
 
-   The following table shows the installation layout of MySQL on Mac
-   OS X Server.
+   The following table shows the installation layout of MySQL on
+   Mac OS X Server.
 
    Table 2.11 MySQL Directory Layout for Preinstalled MySQL
    Installations on Mac OS X Server
@@ -4164,101 +4743,105 @@ shell> sudo /Library/StartupItems/MySQLC
    /usr/share/man Unix manual pages
    /usr/share/mysql/mysql-test MySQL test suite
    /usr/share/mysql Miscellaneous support files, including error
-   messages, character set files, sample configuration files, SQL for
-   database installation
+   messages, character set files, sample configuration files,
+   SQL for database installation
    /var/mysql/mysql.sock Location of the MySQL Unix socket
 
 Additional Resources
 
 
-     * For more information on managing the bundled MySQL instance in
-       Mac OS X Server 10.5, see Mac OS X Server: Web Technologies
-       Administration For Version 10.5 Leopard
-       (http://images.apple.com/server/macosx/docs/Web_Technologies_A
-       dmin_v10.5.pdf).
-
-     * For more information on managing the bundled MySQL instance in
-       Mac OS X Server 10.6, see Mac OS X Server: Web Technologies
-       Administration Version 10.6 Snow Leopard
+     * For more information on managing the bundled MySQL
+       instance in Mac OS X Server 10.5, see Mac OS X Server:
+       Web Technologies Administration For Version 10.5 Leopard
+       (http://images.apple.com/server/macosx/docs/Web_Technolog
+       ies_Admin_v10.5.pdf).
+
+     * For more information on managing the bundled MySQL
+       instance in Mac OS X Server 10.6, see Mac OS X Server:
+       Web Technologies Administration Version 10.6 Snow Leopard
        (http://manuals.info.apple.com/en_US/WebTech_v10.6.pdf).
 
-     * The MySQL server bundled with Mac OS X Server does not include
-       the MySQL client libraries and header files required to access
-       and use MySQL from a third-party driver, such as Perl DBI or
-       PHP. For more information on obtaining and installing MySQL
-       libraries, see Mac OS X Server version 10.5: MySQL libraries
-       available for download (http://support.apple.com/kb/TA25017).
-       Alternatively, you can ignore the bundled MySQL server and
-       install MySQL from the package or tarball installation.
+     * The MySQL server bundled with Mac OS X Server does not
+       include the MySQL client libraries and header files
+       required to access and use MySQL from a third-party
+       driver, such as Perl DBI or PHP. For more information on
+       obtaining and installing MySQL libraries, see Mac OS X
+       Server version 10.5: MySQL libraries available for
+       download (http://support.apple.com/kb/TA25017).
+       Alternatively, you can ignore the bundled MySQL server
+       and install MySQL from the package or tarball
+       installation.
 
 2.5 Installing MySQL on Linux
 
    Linux supports a number of different solutions for installing
-   MySQL. The recommended method is to use one of the distributions
-   from Oracle. If you choose this method, there are several options
-   available:
-
-     * Installing from a generic binary package in .tar.gz format.
-       See Section 2.2, "Installing MySQL on Unix/Linux Using Generic
-       Binaries" for more information.
-
-     * Extracting and compiling MySQL from a source distribution. For
-       detailed instructions, see Section 2.9, "Installing MySQL from
-       Source."
+   MySQL. The recommended method is to use one of the
+   distributions from Oracle. If you choose this method, there
+   are several options available:
+
+     * Installing from a generic binary package in .tar.gz
+       format. See Section 2.2, "Installing MySQL on Unix/Linux
+       Using Generic Binaries" for more information.
+
+     * Extracting and compiling MySQL from a source
+       distribution. For detailed instructions, see Section 2.9,
+       "Installing MySQL from Source."
 
      * Installing using a precompiled RPM package. For more
-       information, see Section 2.5.1, "Installing MySQL on Linux
-       Using RPM Packages."
+       information, see Section 2.5.1, "Installing MySQL on
+       Linux Using RPM Packages."
 
      * Installing using a precompiled Debian package. For more
-       information, see Section 2.5.2, "Installing MySQL on Linux
-       Using Debian Packages."
+       information, see Section 2.5.2, "Installing MySQL on
+       Linux Using Debian Packages."
 
-     * Installing using Oracle's Unbreakable Linux Network (ULN). For
-       more information, see Section 2.6, "Installing MySQL Using
-       Unbreakable Linux Network (ULN)."
-
-   As an alternative, you can use the native package manager within
-   your Linux distribution to automatically download and install
-   MySQL for you. Native package installations can take care of the
-   download and dependencies required to run MySQL, but the MySQL
-   version will often be some versions behind the currently available
-   release. You will also normally be unable to install development
-   releases, as these are not usually made available in the native
-   repository. For more information on using the native package
-   installers, see Section 2.5.3, "Installing MySQL on Linux Using
-   Native Package Managers."
-   Note
-
-   For many Linux installations, you will want to set up MySQL to be
-   started automatically when your machine starts. Many of the native
-   package installations perform this operation for you, but for
-   source, binary and RPM solutions you may need to set this up
-   separately. The required script, mysql.server, can be found in the
-   support-files directory under the MySQL installation directory or
-   in a MySQL source tree. You can install it as /etc/init.d/mysql
-   for automatic MySQL startup and shutdown. See Section 2.10.1.2,
-   "Starting and Stopping MySQL Automatically."
+     * Installing using Oracle's Unbreakable Linux Network
+       (ULN). For more information, see Section 2.6, "Installing
+       MySQL Using Unbreakable Linux Network (ULN)."
+
+   As an alternative, you can use the native package manager
+   within your Linux distribution to automatically download and
+   install MySQL for you. Native package installations can take
+   care of the download and dependencies required to run MySQL,
+   but the MySQL version will often be some versions behind the
+   currently available release. You will also normally be unable
+   to install development releases, as these are not usually
+   made available in the native repository. For more information
+   on using the native package installers, see Section 2.5.3,
+   "Installing MySQL on Linux Using Native Package Managers."
+   Note
+
+   For many Linux installations, you will want to set up MySQL
+   to be started automatically when your machine starts. Many of
+   the native package installations perform this operation for
+   you, but for source, binary and RPM solutions you may need to
+   set this up separately. The required script, mysql.server,
+   can be found in the support-files directory under the MySQL
+   installation directory or in a MySQL source tree. You can
+   install it as /etc/init.d/mysql for automatic MySQL startup
+   and shutdown. See Section 2.10.1.2, "Starting and Stopping
+   MySQL Automatically."
 
 2.5.1 Installing MySQL on Linux Using RPM Packages
 
    Note
 
-   To install or upgrade to MySQL 5.5.31, be sure to read the special
-   instructions at the end of this section.
+   To install or upgrade to MySQL 5.5.31, be sure to read the
+   special instructions at the end of this section.
 
    The recommended way to install MySQL on RPM-based Linux
    distributions is by using the RPM packages. The RPMs that we
-   provide to the community should work on all versions of Linux that
-   support RPM packages and use glibc 2.3. To obtain RPM packages,
-   see Section 2.1.3, "How to Get MySQL."
+   provide to the community should work on all versions of Linux
+   that support RPM packages and use glibc 2.3. To obtain RPM
+   packages, see Section 2.1.3, "How to Get MySQL."
 
-   For non-RPM Linux distributions, you can install MySQL using a
-   .tar.gz package. See Section 2.2, "Installing MySQL on Unix/Linux
-   Using Generic Binaries."
+   For non-RPM Linux distributions, you can install MySQL using
+   a .tar.gz package. See Section 2.2, "Installing MySQL on
+   Unix/Linux Using Generic Binaries."
 
-   Installations created from our Linux RPM distributions result in
-   files under the system directories shown in the following table.
+   Installations created from our Linux RPM distributions result
+   in files under the system directories shown in the following
+   table.
 
    Table 2.12 MySQL Installation Layout for Linux RPM Packages
    Directory Contents of Directory
@@ -4270,128 +4853,141 @@ Additional Resources
    /usr/include/mysql Include (header) files
    /usr/lib/mysql Libraries
    /usr/share/mysql Miscellaneous support files, including error
-   messages, character set files, sample configuration files, SQL for
-   database installation
+   messages, character set files, sample configuration files,
+   SQL for database installation
    /usr/share/sql-bench Benchmarks
    Note
 
-   RPM distributions of MySQL are also provided by other vendors. Be
-   aware that they may differ from those built by us in features,
-   capabilities, and conventions (including communication setup), and
-   that the instructions in this manual do not necessarily apply to
-   installing them. The vendor's instructions should be consulted
-   instead. Because of these differences, RPM packages built by us
-   check whether such RPMs built by other vendors are installed. If
-   so, the RPM does not install and produces a message explaining
-   this.
-
-   Conflicts can arise when an RPM from another vendor is already
-   installed, such as when a vendor's convention about which files
-   belong with the server and which belong with the client library
-   differ from the breakdown used for Oracle packages. In such cases,
-   attempts to install an Oracle RPM with rpm -i may result in
-   messages that files in the RPM to be installed conflict with files
-   from an installed package (denoted mysql-libs in the following
-   paragraphs).
-
-   We provide a MySQL-shared-compat package with each MySQL release.
-   This package is meant to replace mysql-libs and provides a
-   replacement-compatible client library for older MySQL series.
-   MySQL-shared-compat is set up to make mysql-libs obsolete, but rpm
-   explicitly refuses to replace obsoleted packages when invoked with
-   -i (unlike -U), which is why installation with rpm -i produces a
-   conflict.
-
-   MySQL-shared-compat can safely be installed alongside mysql-libs
-   because libraries are installed to different locations. Therefore,
-   it is possible to install shared-compat first, then manually
-   remove mysql-libs before continuing with the installation. After
-   mysql-libs is removed, the dynamic linker stops looking for the
-   client library in the location where mysql-libs puts it, and the
-   library provided by the MySQL-shared-compat package takes over.
+   RPM distributions of MySQL are also provided by other
+   vendors. Be aware that they may differ from those built by us
+   in features, capabilities, and conventions (including
+   communication setup), and that the instructions in this
+   manual do not necessarily apply to installing them. The
+   vendor's instructions should be consulted instead. Because of
+   these differences, RPM packages built by us check whether
+   such RPMs built by other vendors are installed. If so, the
+   RPM does not install and produces a message explaining this.
+
+   Conflicts can arise when an RPM from another vendor is
+   already installed, such as when a vendor's convention about
+   which files belong with the server and which belong with the
+   client library differ from the breakdown used for Oracle
+   packages. In such cases, attempts to install an Oracle RPM
+   with rpm -i may result in messages that files in the RPM to
+   be installed conflict with files from an installed package
+   (denoted mysql-libs in the following paragraphs).
+
+   We provide a MySQL-shared-compat package with each MySQL
+   release. This package is meant to replace mysql-libs and
+   provides a replacement-compatible client library for older
+   MySQL series. MySQL-shared-compat is set up to make
+   mysql-libs obsolete, but rpm explicitly refuses to replace
+   obsoleted packages when invoked with -i (unlike -U), which is
+   why installation with rpm -i produces a conflict.
+
+   MySQL-shared-compat can safely be installed alongside
+   mysql-libs because libraries are installed to different
+   locations. Therefore, it is possible to install shared-compat
+   first, then manually remove mysql-libs before continuing with
+   the installation. After mysql-libs is removed, the dynamic
+   linker stops looking for the client library in the location
+   where mysql-libs puts it, and the library provided by the
+   MySQL-shared-compat package takes over.
 
    Another alternative is to install packages using yum. In a
-   directory containing all RPM packages for a MySQL release, yum
-   install MySQL*rpm installs them in the correct order and removes
-   mysql-libs in one step without conflicts.
+   directory containing all RPM packages for a MySQL release,
+   yum install MySQL*rpm installs them in the correct order and
+   removes mysql-libs in one step without conflicts.
 
    In most cases, you need to install only the MySQL-server and
-   MySQL-client packages to get a functional MySQL installation. The
-   other packages are not required for a standard installation.
+   MySQL-client packages to get a functional MySQL installation.
+   The other packages are not required for a standard
+   installation.
 
-   RPMs for MySQL Cluster.  Standard MySQL server RPMs built by MySQL
-   do not provide support for the NDBCLUSTER storage engine.
+   RPMs for MySQL Cluster.  Standard MySQL server RPMs built by
+   MySQL do not provide support for the NDBCLUSTER storage
+   engine.
    Important
 
-   When upgrading a MySQL Cluster RPM installation, you must upgrade
-   all installed RPMs, including the Server and Client RPMs.
-
-   For more information about installing MySQL Cluster from RPMs, see
-   Section 18.2, "MySQL Cluster Installation and Upgrades."
+   When upgrading a MySQL Cluster RPM installation, you must
+   upgrade all installed RPMs, including the Server and Client
+   RPMs.
+
+   For more information about installing MySQL Cluster from
+   RPMs, see Section 18.2, "MySQL Cluster Installation and
+   Upgrades."
 
    For upgrades, if your installation was originally produced by
-   installing multiple RPM packages, it is best to upgrade all the
-   packages, not just some. For example, if you previously installed
-   the server and client RPMs, do not upgrade just the server RPM.
+   installing multiple RPM packages, it is best to upgrade all
+   the packages, not just some. For example, if you previously
+   installed the server and client RPMs, do not upgrade just the
+   server RPM.
 
    If the data directory exists at RPM installation time, the
-   installation process does not modify existing data. This has the
-   effect, for example, that accounts in the grant tables are not
-   initialized to the default set of accounts.
+   installation process does not modify existing data. This has
+   the effect, for example, that accounts in the grant tables
+   are not initialized to the default set of accounts.
 
    If you get a dependency failure when trying to install MySQL
-   packages (for example, error: removing these packages would break
-   dependencies: libmysqlclient.so.10 is needed by ...), you should
-   also install the MySQL-shared-compat package, which includes the
-   shared libraries for older releases for backward compatibility.
-
-   The RPM packages shown in the following list are available. The
-   names shown here use a suffix of .glibc23.i386.rpm, but particular
-   packages can have different suffixes, described later.
+   packages (for example, error: removing these packages would
+   break dependencies: libmysqlclient.so.10 is needed by ...),
+   you should also install the MySQL-shared-compat package,
+   which includes the shared libraries for older releases for
+   backward compatibility.
+
+   The RPM packages shown in the following list are available.
+   The names shown here use a suffix of .glibc23.i386.rpm, but
+   particular packages can have different suffixes, described
+   later. If you plan to install multiple RPM packages, you may
+   wish to download the RPM Bundle tar file instead, which
+   contains multiple RPM packages to that you need not download
+   them separately.
 
      * MySQL-server-VERSION.glibc23.i386.rpm
        The MySQL server. You need this unless you only want to
        connect to a MySQL server running on another machine.
 
      * MySQL-client-VERSION.glibc23.i386.rpm
-       The standard MySQL client programs. You probably always want
-       to install this package.
+       The standard MySQL client programs. You probably always
+       want to install this package.
 
      * MySQL-devel-VERSION.glibc23.i386.rpm
-       The libraries and include files that are needed if to compile
-       other MySQL clients, such as the Perl modules. Install this
-       RPM if you intend to compile C API applications.
+       The libraries and include files that are needed if to
+       compile other MySQL clients, such as the Perl modules.
+       Install this RPM if you intend to compile C API
+       applications.
 
      * MySQL-shared-VERSION.glibc23.i386.rpm
        This package contains the shared libraries
-       (libmysqlclient.so*) that certain languages and applications
-       need to dynamically load and use MySQL. It contains
-       single-threaded and thread-safe libraries. Install this RPM if
-       you intend to compile or run C API applications that depend on
-       the shared client library. Prior to MySQL 5.5.6, if you
-       install this package, do not install the MySQL-shared-compat
-       package.
+       (libmysqlclient.so*) that certain languages and
+       applications need to dynamically load and use MySQL. It
+       contains single-threaded and thread-safe libraries.
+       Install this RPM if you intend to compile or run C API
+       applications that depend on the shared client library.
+       Prior to MySQL 5.5.6, if you install this package, do not
+       install the MySQL-shared-compat package.
 
      * MySQL-shared-compat-VERSION.glibc23.i386.rpm
-       This package includes the shared libraries for older releases.
-       It contains single-threaded and thread-safe libraries. Install
-       this package if you have applications installed that are
-       dynamically linked against older versions of MySQL but you
-       want to upgrade to the current version without breaking the
-       library dependencies. Before MySQL 5.5.6, MySQL-shared-compat
-       also includes the libraries for the current release, so if you
-       install it, you should not also install MySQL-shared. As of
-       5.5.6, MySQL-shared-compat does not include the current
-       library version, so there is no conflict.
+       This package includes the shared libraries for older
+       releases. It contains single-threaded and thread-safe
+       libraries. Install this package if you have applications
+       installed that are dynamically linked against older
+       versions of MySQL but you want to upgrade to the current
+       version without breaking the library dependencies. Before
+       MySQL 5.5.6, MySQL-shared-compat also includes the
+       libraries for the current release, so if you install it,
+       you should not also install MySQL-shared. As of 5.5.6,
+       MySQL-shared-compat does not include the current library
+       version, so there is no conflict.
        As of MySQL 5.5.23, the MySQL-shared-compat RPM package
-       enables users of Red Hat-provided mysql-*-5.1 RPM packages to
-       migrate to Oracle-provided MySQL-*-5.5 packages.
-       MySQL-shared-compat replaces the Red Hat mysql-libs package by
-       replacing libmysqlclient.so files of the latter package, thus
-       satisfying dependencies of other packages on mysql-libs. This
-       change affects only users of Red Hat (or Red Hat-compatible)
-       RPM packages. Nothing is different for users of Oracle RPM
-       packages.
+       enables users of Red Hat-provided mysql-*-5.1 RPM
+       packages to migrate to Oracle-provided MySQL-*-5.5
+       packages. MySQL-shared-compat replaces the Red Hat
+       mysql-libs package by replacing libmysqlclient.so files
+       of the latter package, thus satisfying dependencies of
+       other packages on mysql-libs. This change affects only
+       users of Red Hat (or Red Hat-compatible) RPM packages.
+       Nothing is different for users of Oracle RPM packages.
 
      * MySQL-embedded-VERSION.glibc23.i386.rpm
        The embedded MySQL server library.
@@ -4401,179 +4997,192 @@ Additional Resources
 
      * MySQL-VERSION.src.rpm
        This contains the source code for all of the previous
-       packages. It can also be used to rebuild the RPMs on other
-       architectures (for example, Alpha or SPARC).
+       packages. It can also be used to rebuild the RPMs on
+       other architectures (for example, Alpha or SPARC).
 
-   The suffix of RPM package names (following the VERSION value) has
-   the following syntax:
+   The suffix of RPM package names (following the VERSION value)
+   has the following syntax:
 .PLATFORM.CPU.rpm
 
-   The PLATFORM and CPU values indicate the type of system for which
-   the package is built. PLATFORM indicates the platform and CPU
-   indicates the processor type or family.
+   The PLATFORM and CPU values indicate the type of system for
+   which the package is built. PLATFORM indicates the platform
+   and CPU indicates the processor type or family.
 
    All packages are dynamically linked against glibc 2.3. The
    PLATFORM value indicates whether the package is platform
-   independent or intended for a specific platform, as shown in the
-   following table.
+   independent or intended for a specific platform, as shown in
+   the following table.
 
    Table 2.13 MySQL Linux Installation Packages
    PLATFORM Value Intended Use
-   glibc23 Platform independent, should run on any Linux distribution
-   that supports glibc 2.3
+   glibc23 Platform independent, should run on any Linux
+   distribution that supports glibc 2.3
    rhel4, rhel5 Red Hat Enterprise Linux 4 or 5
    el6 Enterprise Linux 6
    sles10, sles11 SuSE Linux Enterprise Server 10 or 11
 
    In MySQL 5.5, only glibc23 packages are available currently.
 
-   The CPU value indicates the processor type or family for which the
-   package is built.
+   The CPU value indicates the processor type or family for
+   which the package is built.
 
-   Table 2.14 MySQL Installation Packages for Linux CPU Identifiers
+   Table 2.14 MySQL Installation Packages for Linux CPU
+   Identifiers
       CPU Value      Intended Processor Type or Family
    i386, i586, i686 Pentium processor or better, 32 bit
    x86_64           64-bit x86 processor
    ia64             Itanium (IA-64) processor
 
-   To see all files in an RPM package (for example, a MySQL-server
-   RPM), run a command like this:
+   To see all files in an RPM package (for example, a
+   MySQL-server RPM), run a command like this:
 shell> rpm -qpl MySQL-server-VERSION.glibc23.i386.rpm
 
-   To perform a standard minimal installation, install the server and
-   client RPMs:
+   To perform a standard minimal installation, install the
+   server and client RPMs:
 shell> rpm -i MySQL-server-VERSION.glibc23.i386.rpm
 shell> rpm -i MySQL-client-VERSION.glibc23.i386.rpm
 
-   To install only the client programs, install just the client RPM:
+   To install only the client programs, install just the client
+   RPM:
 shell> rpm -i MySQL-client-VERSION.glibc23.i386.rpm
 
-   RPM provides a feature to verify the integrity and authenticity of
-   packages before installing them. To learn more about this feature,
-   see Section 2.1.4, "Verifying Package Integrity Using MD5
-   Checksums or GnuPG."
-
-   The server RPM places data under the /var/lib/mysql directory. The
-   RPM also creates a login account for a user named mysql (if one
-   does not exist) to use for running the MySQL server, and creates
-   the appropriate entries in /etc/init.d/ to start the server
-   automatically at boot time. (This means that if you have performed
-   a previous installation and have made changes to its startup
-   script, you may want to make a copy of the script so that you do
-   not lose it when you install a newer RPM.) See Section 2.10.1.2,
-   "Starting and Stopping MySQL Automatically," for more information
-   on how MySQL can be started automatically on system startup.
-
-   In MySQL 5.5.5 and later, during a new installation, the server
-   boot scripts are installed, but the MySQL server is not started at
-   the end of the installation, since the status of the server during
-   an unattended installation is not known.
-
-   In MySQL 5.5.5 and later, during an upgrade installation using the
-   RPM packages, if the MySQL server is running when the upgrade
-   occurs, the MySQL server is stopped, the upgrade occurs, and the
-   MySQL server is restarted. If the MySQL server is not already
-   running when the RPM upgrade occurs, the MySQL server is not
-   started at the end of the installation.
+   RPM provides a feature to verify the integrity and
+   authenticity of packages before installing them. To learn
+   more about this feature, see Section 2.1.4, "Verifying
+   Package Integrity Using MD5 Checksums or GnuPG."
+
+   The server RPM places data under the /var/lib/mysql
+   directory. The RPM also creates a login account for a user
+   named mysql (if one does not exist) to use for running the
+   MySQL server, and creates the appropriate entries in
+   /etc/init.d/ to start the server automatically at boot time.
+   (This means that if you have performed a previous
+   installation and have made changes to its startup script, you
+   may want to make a copy of the script so that you do not lose
+   it when you install a newer RPM.) See Section 2.10.1.2,
+   "Starting and Stopping MySQL Automatically," for more
+   information on how MySQL can be started automatically on
+   system startup.
+
+   In MySQL 5.5.5 and later, during a new installation, the
+   server boot scripts are installed, but the MySQL server is
+   not started at the end of the installation, since the status
+   of the server during an unattended installation is not known.
+
+   In MySQL 5.5.5 and later, during an upgrade installation
+   using the RPM packages, if the MySQL server is running when
+   the upgrade occurs, the MySQL server is stopped, the upgrade
+   occurs, and the MySQL server is restarted. If the MySQL
+   server is not already running when the RPM upgrade occurs,
+   the MySQL server is not started at the end of the
+   installation.
 
    If something goes wrong, you can find more information in the
-   binary installation section. See Section 2.2, "Installing MySQL on
-   Unix/Linux Using Generic Binaries."
+   binary installation section. See Section 2.2, "Installing
+   MySQL on Unix/Linux Using Generic Binaries."
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.10,
-   "Postinstallation Setup and Testing."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10, "Postinstallation Setup and Testing."
 
    During RPM installation, a user named mysql and a group named
-   mysql are created on the system. This is done using the useradd,
-   groupadd, and usermod commands. Those commands require appropriate
-   administrative privileges, which is required for locally managed
-   users and groups (as listed in the /etc/passwd and /etc/group
-   files) by the RPM installation process being run by root.
-
-   If you log in as the mysql user, you may find that MySQL displays
-   "Invalid (old?) table or database name" errors that mention
-   .mysqlgui, lost+found, .mysqlgui, .bash_history, .fonts.cache-1,
-   .lesshst, .mysql_history, .profile, .viminfo, and similar files
-   created by MySQL or operating system utilities. You can safely
-   ignore these error messages or remove the files or directories
-   that cause them if you do not need them.
+   mysql are created on the system. This is done using the
+   useradd, groupadd, and usermod commands. Those commands
+   require appropriate administrative privileges, which is
+   required for locally managed users and groups (as listed in
+   the /etc/passwd and /etc/group files) by the RPM installation
+   process being run by root.
+
+   If you log in as the mysql user, you may find that MySQL
+   displays "Invalid (old?) table or database name" errors that
+   mention .mysqlgui, lost+found, .mysqlgui, .bash_history,
+   .fonts.cache-1, .lesshst, .mysql_history, .profile, .viminfo,
+   and similar files created by MySQL or operating system
+   utilities. You can safely ignore these error messages or
+   remove the files or directories that cause them if you do not
+   need them.
 
    For nonlocal user management (LDAP, NIS, and so forth), the
-   administrative tools may require additional authentication (such
-   as a password), and will fail if the installing user does not
-   provide this authentication. Even if they fail, the RPM
-   installation will not abort but succeed, and this is intentional.
-   If they failed, some of the intended transfer of ownership may be
-   missing, and it is recommended that the system administrator then
-   manually ensures some appropriate user and group exists and
-   manually transfers ownership following the actions in the RPM spec
-   file.
+   administrative tools may require additional authentication
+   (such as a password), and will fail if the installing user
+   does not provide this authentication. Even if they fail, the
+   RPM installation will not abort but succeed, and this is
+   intentional. If they failed, some of the intended transfer of
+   ownership may be missing, and it is recommended that the
+   system administrator then manually ensures some appropriate
+   user and group exists and manually transfers ownership
+   following the actions in the RPM spec file.
 
-   In MySQL 5.5.31, the RPM spec file has been updated, which has the
-   following consequences:
+   In MySQL 5.5.31, the RPM spec file has been updated, which
+   has the following consequences:
 
      * For a non-upgrade installation (no existing MySQL version
        installed), it possible to install MySQL using yum.
 
-     * For upgrades, it is necessary to clean up any earlier MySQL
-       installations. In effect, the update is performed by removing
-       the old installations and installing the new one.
+     * For upgrades, it is necessary to clean up any earlier
+       MySQL installations. In effect, the update is performed
+       by removing the old installations and installing the new
+       one.
 
    Additional details follow.
 
-   For a non-upgrade installation of MySQL 5.5.31, it is possible to
-   install using yum:
+   For a non-upgrade installation of MySQL 5.5.31, it is
+   possible to install using yum:
 shell> yum install MySQL-server-NEWVERSION.glibc23.i386.rpm
 
-   For upgrades to MySQL 5.5.31, the upgrade is performed by removing
-   the old installation and installing the new one. To do this, use
-   the following procedure:
+   For upgrades to MySQL 5.5.31, the upgrade is performed by
+   removing the old installation and installing the new one. To
+   do this, use the following procedure:
 
     1. Remove the existing 5.5.X installation. OLDVERSION is the
        version to remove.
 shell> rpm -e MySQL-server-OLDVERSION.glibc23.i386.rpm
+
        Repeat this step for all installed MySQL RPMs.
 
-    2. Install the new version. NEWVERSION is the version to install.
+    2. Install the new version. NEWVERSION is the version to
+       install.
 shell> rpm -ivh MySQL-server-NEWVERSION.glibc23.i386.rpm
 
-   Alternatively, the removal and installation can be done using yum:
+   Alternatively, the removal and installation can be done using
+   yum:
 shell> yum remove MySQL-server-OLDVERSION.glibc23.i386.rpm
 shell> yum install MySQL-server-NEWVERSION.glibc23.i386.rpm
 
 2.5.2 Installing MySQL on Linux Using Debian Packages
 
    Oracle provides Debian packages for installation on Debian or
-   Debian-like Linux systems. To obtain a package, see Section 2.1.3,
-   "How to Get MySQL."
+   Debian-like Linux systems. To obtain a package, see Section
+   2.1.3, "How to Get MySQL."
    Note
 
-   Debian distributions of MySQL are also provided by other vendors.
-   Be aware that they may differ from those built by us in features,
-   capabilities, and conventions (including communication setup), and
-   that the instructions in this manual do not necessarily apply to
-   installing them. The vendor's instructions should be consulted
-   instead.
-
-   Debian package files have names in mysql-MVER-DVER-CPU.deb format.
-   MVER is the MySQL version and DVER is the Debian version. The CPU
-   value indicates the processor type or family for which the package
-   is built, as shown in the following table.
+   Debian distributions of MySQL are also provided by other
+   vendors. Be aware that they may differ from those built by us
+   in features, capabilities, and conventions (including
+   communication setup), and that the instructions in this
+   manual do not necessarily apply to installing them. The
+   vendor's instructions should be consulted instead.
+
+   Debian package files have names in mysql-MVER-DVER-CPU.deb
+   format. MVER is the MySQL version and DVER is the Debian
+   version. The CPU value indicates the processor type or family
+   for which the package is built, as shown in the following
+   table.
 
-   Table 2.15 MySQL Installation Packages for Linux CPU Identifiers
+   Table 2.15 MySQL Installation Packages for Linux CPU
+   Identifiers
    CPU Value  Intended Processor Type or Family
    i686      Pentium processor or better, 32 bit
    x86_64    64-bit x86 processor
 
-   After downloading a Debian package, use the following command to
-   install it;
+   After downloading a Debian package, use the following command
+   to install it;
 shell> dpkg -i mysql-MVER-DVER-CPU.deb
 
-   The Debian package installs files in the /opt/mysql/server-5.5
-   directory.
+   The Debian package installs files in the
+   /opt/mysql/server-5.5 directory.
 
    You may also need to install the libaio library if it is not
    already present on your system:
@@ -4581,30 +5190,33 @@ shell> apt-get install libaio1
 
 2.5.3 Installing MySQL on Linux Using Native Package Managers
 
-   Many Linux distributions include a version of the MySQL server,
-   client tools, and development components into the standard package
-   management system built into distributions such as Fedora, Debian,
-   Ubuntu, and Gentoo. This section provides basic instructions for
-   installing MySQL using these systems.
+   Many Linux distributions include a version of the MySQL
+   server, client tools, and development components into the
+   standard package management system built into distributions
+   such as Fedora, Debian, Ubuntu, and Gentoo. This section
+   provides basic instructions for installing MySQL using these
+   systems.
    Important
 
-   Native package installations can take care of the download and
-   dependencies required to run MySQL, but the MySQL version will
-   often be some way behind the currently available release. You will
-   also normally be unable to install development releases, as these
-   are not usually made available in the native repository.
+   Native package installations can take care of the download
+   and dependencies required to run MySQL, but the MySQL version
+   will often be some way behind the currently available
+   release. You will also normally be unable to install
+   development releases, as these are not usually made available
+   in the native repository.
 
    Distribution specific instructions are shown below:
 
      * Red Hat Linux, Fedora, CentOS
-       For Red Hat and similar distributions, the MySQL distribution
-       is divided into a number of separate packages, mysql for the
-       client tools, mysql-server for the server and associated
-       tools, and mysql-libs for the libraries. The libraries are
-       required if you want to provide connectivity from different
-       languages and environments such as Perl, Python and others.
-       To install, use the yum command to specify the packages that
-       you want to install. For example:
+       For Red Hat and similar distributions, the MySQL
+       distribution is divided into a number of separate
+       packages, mysql for the client tools, mysql-server for
+       the server and associated tools, and mysql-libs for the
+       libraries. The libraries are required if you want to
+       provide connectivity from different languages and
+       environments such as Perl, Python and others.
+       To install, use the yum command to specify the packages
+       that you want to install. For example:
 root-shell> yum install mysql mysql-server mysql-libs mysql-server
 Loaded plugins: presto, refresh-packagekit
 Setting up Install Process
@@ -4613,34 +5225,34 @@ Resolving Dependencies
 ---> Package mysql.x86_64 0:5.1.48-2.fc13 set to be updated
 ---> Package mysql-libs.x86_64 0:5.1.48-2.fc13 set to be updated
 ---> Package mysql-server.x86_64 0:5.1.48-2.fc13 set to be updated
---> Processing Dependency: perl-DBD-MySQL for package: mysql-server-5
-.1.48-2.fc13.x86_64
+--> Processing Dependency: perl-DBD-MySQL for package: mysql-server-5.
+1.48-2.fc13.x86_64
 --> Running transaction check
 ---> Package perl-DBD-MySQL.x86_64 0:4.017-1.fc13 set to be updated
 --> Finished Dependency Resolution
 
 Dependencies Resolved
 
-=====================================================================
-===========
+======================================================================
+==========
  Package               Arch          Version               Repository
-      Size
-=====================================================================
-===========
+     Size
+======================================================================
+==========
 Installing:
  mysql                 x86_64        5.1.48-2.fc13         updates
-     889 k
+    889 k
  mysql-libs            x86_64        5.1.48-2.fc13         updates
-     1.2 M
+    1.2 M
  mysql-server          x86_64        5.1.48-2.fc13         updates
-     8.1 M
+    8.1 M
 Installing for dependencies:
  perl-DBD-MySQL        x86_64        4.017-1.fc13          updates
-     136 k
+    136 k
 
 Transaction Summary
-=====================================================================
-===========
+======================================================================
+==========
 Install       4 Package(s)
 Upgrade       0 Package(s)
 
@@ -4652,33 +5264,33 @@ Setting up and reading Presto delta meta
 Processing delta metadata
 Package(s) data still to download: 10 M
 (1/4): mysql-5.1.48-2.fc13.x86_64.rpm                    | 889 kB
- 00:04
+00:04
 (2/4): mysql-libs-5.1.48-2.fc13.x86_64.rpm               | 1.2 MB
- 00:06
+00:06
 (3/4): mysql-server-5.1.48-2.fc13.x86_64.rpm             | 8.1 MB
- 00:40
+00:40
 (4/4): perl-DBD-MySQL-4.017-1.fc13.x86_64.rpm            | 136 kB
- 00:00
----------------------------------------------------------------------
------------
+00:00
+----------------------------------------------------------------------
+----------
 Total                                           201 kB/s |  10 MB
- 00:52
+00:52
 Running rpm_check_debug
 Running Transaction Test
 Transaction Test Succeeded
 Running Transaction
   Installing     : mysql-libs-5.1.48-2.fc13.x86_64
-       1/4
+      1/4
   Installing     : mysql-5.1.48-2.fc13.x86_64
-       2/4
+      2/4
   Installing     : perl-DBD-MySQL-4.017-1.fc13.x86_64
-       3/4
+      3/4
   Installing     : mysql-server-5.1.48-2.fc13.x86_64
-       4/4
+      4/4
 
 Installed:
-  mysql.x86_64 0:5.1.48-2.fc13            mysql-libs.x86_64 0:5.1.48-
-2.fc13
+  mysql.x86_64 0:5.1.48-2.fc13            mysql-libs.x86_64 0:5.1.48-2
+.fc13
   mysql-server.x86_64 0:5.1.48-2.fc13
 
 Dependency Installed:
@@ -4686,73 +5298,76 @@ Dependency Installed:
 
 
 Complete!
-       MySQL and the MySQL server should now be installed. A sample
-       configuration file is installed into /etc/my.cnf. An init
-       script, to start and stop the server, will have been installed
-       into /etc/init.d/mysqld. To start the MySQL server use
-       service:
+
+       MySQL and the MySQL server should now be installed. A
+       sample configuration file is installed into /etc/my.cnf.
+       An init script, to start and stop the server, will have
+       been installed into /etc/init.d/mysqld. To start the
+       MySQL server use service:
 root-shell> service mysqld start
-       To enable the server to be started and stopped automatically
-       during boot, use chkconfig:
+
+       To enable the server to be started and stopped
+       automatically during boot, use chkconfig:
 root-shell> chkconfig --levels 235 mysqld on
-       Which enables the MySQL server to be started (and stopped)
-       automatically at the specified the run levels.
-       The database tables will have been automatically created for
-       you, if they do not already exist. You should, however, run
-       mysql_secure_installation to set the root passwords on your
-       server.
+
+       Which enables the MySQL server to be started (and
+       stopped) automatically at the specified the run levels.
+       The database tables will have been automatically created
+       for you, if they do not already exist. You should,
+       however, run mysql_secure_installation to set the root
+       passwords on your server.
 
      * Debian, Ubuntu, Kubuntu
-       On Debian and related distributions, there are two packages,
-       mysql-client and mysql-server, for the client and server
-       components respectively. You should specify an explicit
-       version, for example mysql-client-5.1, to ensure that you
-       install the version of MySQL that you want.
-       To download and install, including any dependencies, use the
-       apt-get command, specifying the packages that you want to
-       install.
+       On Debian and related distributions, there are two
+       packages, mysql-client and mysql-server, for the client
+       and server components respectively. You should specify an
+       explicit version, for example mysql-client-5.1, to ensure
+       that you install the version of MySQL that you want.
+       To download and install, including any dependencies, use
+       the apt-get command, specifying the packages that you
+       want to install.
        Note
        Before installing, make sure that you update your apt-get
-       index files to ensure you are downloading the latest available
-       version.
-       A sample installation of the MySQL packages might look like
-       this (some sections trimmed for clarity):
+       index files to ensure you are downloading the latest
+       available version.
+       A sample installation of the MySQL packages might look
+       like this (some sections trimmed for clarity):
 root-shell> apt-get install mysql-client-5.1 mysql-server-5.1
 Reading package lists... Done
 Building dependency tree
 Reading state information... Done
 The following packages were automatically installed and are no longer
- required:
+required:
   linux-headers-2.6.28-11 linux-headers-2.6.28-11-generic
 Use 'apt-get autoremove' to remove them.
 The following extra packages will be installed:
   bsd-mailx libdbd-mysql-perl libdbi-perl libhtml-template-perl
-  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-pe
-rl mailx
+  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-per
+l mailx
   mysql-common postfix
 Suggested packages:
-  dbishell libipc-sharedcache-perl tinyca procmail postfix-mysql post
-fix-pgsql
+  dbishell libipc-sharedcache-perl tinyca procmail postfix-mysql postf
+ix-pgsql
   postfix-ldap postfix-pcre sasl2-bin resolvconf postfix-cdb
 The following NEW packages will be installed
   bsd-mailx libdbd-mysql-perl libdbi-perl libhtml-template-perl
-  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-pe
-rl mailx
+  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-per
+l mailx
   mysql-client-5.1 mysql-common mysql-server-5.1 postfix
 0 upgraded, 13 newly installed, 0 to remove and 182 not upgraded.
 Need to get 1907kB/25.3MB of archives.
 After this operation, 59.5MB of additional disk space will be used.
 Do you want to continue [Y/n]? Y
-Get: 1 http://gb.archive.ubuntu.com jaunty-updates/main mysql-common
-5.1.30really5.0.75-0ubuntu10.5 [63.6kB]
-Get: 2 http://gb.archive.ubuntu.com jaunty-updates/main libmysqlclien
-t15off 5.1.30really5.0.75-0ubuntu10.5 [1843kB]
+Get: 1 http://gb.archive.ubuntu.com jaunty-updates/main mysql-common 5
+.1.30really5.0.75-0ubuntu10.5 [63.6kB]
+Get: 2 http://gb.archive.ubuntu.com jaunty-updates/main libmysqlclient
+15off 5.1.30really5.0.75-0ubuntu10.5 [1843kB]
 Fetched 1907kB in 9s (205kB/s)
 
 Preconfiguring packages ...
 Selecting previously deselected package mysql-common.
-(Reading database ... 121260 files and directories currently installe
-d.)
+(Reading database ... 121260 files and directories currently installed
+.)
 ...
 Processing 1 added doc-base file(s)...
 Registering documents with scrollkeeper...
@@ -4772,48 +5387,50 @@ Setting up mysql-server-5.1 (5.1.31-1ubu
    ...done.
 100825 11:46:15  InnoDB: Started; log sequence number 0 46409
 100825 11:46:15  InnoDB: Starting shutdown...
-100825 11:46:17  InnoDB: Shutdown completed; log sequence number 0 46
-409
+100825 11:46:17  InnoDB: Shutdown completed; log sequence number 0 464
+09
 100825 11:46:17 [Warning] Forcing shutdown of 1 plugins
 
  * Starting MySQL database server mysqld
    ...done.
 
- * Checking for corrupt, not cleanly closed and upgrade needing table
-s.
+ * Checking for corrupt, not cleanly closed and upgrade needing tables
+.
 ...
 Processing triggers for libc6 ...
 ldconfig deferred processing now taking place
+
        Note
        The apt-get command will install a number of packages,
-       including the MySQL server, in order to provide the typical
-       tools and application environment. This can mean that you
-       install a large number of packages in addition to the main
-       MySQL package.
-       During installation, the initial database will be created, and
-       you will be prompted for the MySQL root password (and
-       confirmation). A configuration file will have been created in
-       /etc/mysql/my.cnf. An init script will have been created in
-       /etc/init.d/mysql.
-       The server will already be started. You can manually start and
-       stop the server using:
+       including the MySQL server, in order to provide the
+       typical tools and application environment. This can mean
+       that you install a large number of packages in addition
+       to the main MySQL package.
+       During installation, the initial database will be
+       created, and you will be prompted for the MySQL root
+       password (and confirmation). A configuration file will
+       have been created in /etc/mysql/my.cnf. An init script
+       will have been created in /etc/init.d/mysql.
+       The server will already be started. You can manually
+       start and stop the server using:
 root-shell> service mysql [start|stop]
-       The service will automatically be added to the 2, 3 and 4 run
-       levels, with stop scripts in the single, shutdown and restart
-       levels.
+
+       The service will automatically be added to the 2, 3 and 4
+       run levels, with stop scripts in the single, shutdown and
+       restart levels.
 
      * Gentoo Linux
-       As a source-based distribution, installing MySQL on Gentoo
-       involves downloading the source, patching the Gentoo
-       specifics, and then compiling the MySQL server and installing
-       it. This process is handled automatically by the emerge
-       command. Depending on the version of MySQL that you want to
-       install, you may need to unmask the specific version that you
-       want for your chosen platform.
-       The MySQL server and client tools are provided within a single
-       package, dev-db/mysql. You can obtain a list of the versions
-       available to install by looking at the portage directory for
-       the package:
+       As a source-based distribution, installing MySQL on
+       Gentoo involves downloading the source, patching the
+       Gentoo specifics, and then compiling the MySQL server and
+       installing it. This process is handled automatically by
+       the emerge command. Depending on the version of MySQL
+       that you want to install, you may need to unmask the
+       specific version that you want for your chosen platform.
+       The MySQL server and client tools are provided within a
+       single package, dev-db/mysql. You can obtain a list of
+       the versions available to install by looking at the
+       portage directory for the package:
 root-shell> ls /usr/portage/dev-db/mysql/mysql-5.1*
 mysql-5.1.39-r1.ebuild
 mysql-5.1.44-r1.ebuild
@@ -4823,187 +5440,200 @@ mysql-5.1.44.ebuild
 mysql-5.1.45-r1.ebuild
 mysql-5.1.45.ebuild
 mysql-5.1.46.ebuild
+
        To install a specific MySQL version, you must specify the
        entire atom. For example:
 root-shell> emerge =dev-db/mysql-5.1.46
-       A simpler alternative is to use the virtual/mysql-5.1 package,
-       which will install the latest version:
+
+       A simpler alternative is to use the virtual/mysql-5.1
+       package, which will install the latest version:
 root-shell> emerge =virtual/mysql-5.1
+
        If the package is masked (because it is not tested or
-       certified for the current platform), use the ACCEPT_KEYWORDS
-       environment variable. For example:
+       certified for the current platform), use the
+       ACCEPT_KEYWORDS environment variable. For example:
 root-shell> ACCEPT_KEYWORDS="~x86" emerge =virtual/mysql-5.1
-       After installation, you should create a new database using
-       mysql_install_db, and set the password for the root user on
-       MySQL. You can use the configuration interface to set the
-       password and create the initial database:
+
+       After installation, you should create a new database
+       using mysql_install_db, and set the password for the root
+       user on MySQL. You can use the configuration interface to
+       set the password and create the initial database:
 root-shell> emerge --config =dev-db/mysql-5.1.46
-       A sample configuration file will have been created for you in
-       /etc/mysql/my.cnf, and an init script will have been created
-       in /etc/init.d/mysql.
-       To enable MySQL to start automatically at the normal (default)
-       run levels, you can use:
+
+       A sample configuration file will have been created for
+       you in /etc/mysql/my.cnf, and an init script will have
+       been created in /etc/init.d/mysql.
+       To enable MySQL to start automatically at the normal
+       (default) run levels, you can use:
 root-shell> rc-update add mysql default
 
 2.6 Installing MySQL Using Unbreakable Linux Network (ULN)
 
    Linux supports a number of different solutions for installing
-   MySQL, covered in Section 2.5, "Installing MySQL on Linux." One of
-   the methods, covered in this section, is installing from Oracles's
-   Unbreakable Linux Network (ULN). You can find information about
-   Oracle Linux and ULN under http://linux.oracle.com/.
+   MySQL, covered in Section 2.5, "Installing MySQL on Linux."
+   One of the methods, covered in this section, is installing
+   from Oracles's Unbreakable Linux Network (ULN). You can find
+   information about Oracle Linux and ULN under
+   http://linux.oracle.com/.
 
    To use ULN, you need to obtain a ULN login and register the
    machine used for installation with ULN. This is described in
-   detail in the ULN FAQ (https://linux.oracle.com/uln_faq.html). The
-   page also describes how to install and update packages.The MySQL
-   packages are in the "MySQL for Oracle Linux 6" channel for your
-   system architecture on ULN.
+   detail in the ULN FAQ
+   (https://linux.oracle.com/uln_faq.html). The page also
+   describes how to install and update packages.The MySQL
+   packages are in the "MySQL for Oracle Linux 6" channel for
+   your system architecture on ULN.
    Note
 
-   At the time of this writing, ULN provides MySQL 5.5 for Oracle
-   Linux 6.
-
-   Once MySQL has been installed using ULN, you can find information
-   on starting and stopping the server, and more, in this section,
-   particularly under Section 2.5.1, "Installing MySQL on Linux Using
-   RPM Packages."
+   At the time of this writing, ULN provides MySQL 5.5 for
+   Oracle Linux 6.
+
+   Once MySQL has been installed using ULN, you can find
+   information on starting and stopping the server, and more, in
+   this section, particularly under Section 2.5.1, "Installing
+   MySQL on Linux Using RPM Packages."
 
    If you're updating an existing MySQL installation to an
-   installation using ULN, the recommended procedure is to export
-   your data using mysqldump, remove the existing installation,
-   install MySQL from ULN, and load the exported data into your
-   freshly installed MySQL.
-
-   If the existing MySQL installation you're upgrading from is from a
-   previous release series (prior to MySQL 5.5), make sure to read
-   the section on upgrading MySQL, Section 2.11.1, "Upgrading MySQL."
+   installation using ULN, the recommended procedure is to
+   export your data using mysqldump, remove the existing
+   installation, install MySQL from ULN, and load the exported
+   data into your freshly installed MySQL.
+
+   If the existing MySQL installation you're upgrading from is
+   from a previous release series (prior to MySQL 5.5), make
+   sure to read the section on upgrading MySQL, Section 2.11.1,
+   "Upgrading MySQL."
 
 2.7 Installing MySQL on Solaris and OpenSolaris
 
    MySQL on Solaris and OpenSolaris is available in a number of
    different formats.
 
-     * For information on installing using the native Solaris PKG
-       format, see Section 2.7.1, "Installing MySQL on Solaris Using
-       a Solaris PKG."
+     * For information on installing using the native Solaris
+       PKG format, see Section 2.7.1, "Installing MySQL on
+       Solaris Using a Solaris PKG."
 
      * On OpenSolaris, the standard package repositories include
-       MySQL packages specially built for OpenSolaris that include
-       entries for the Service Management Framework (SMF) to enable
-       control of the installation using the SMF administration
-       commands. For more information, see Section 2.7.2, "Installing
-       MySQL on OpenSolaris Using IPS."
+       MySQL packages specially built for OpenSolaris that
+       include entries for the Service Management Framework
+       (SMF) to enable control of the installation using the SMF
+       administration commands. For more information, see
+       Section 2.7.2, "Installing MySQL on OpenSolaris Using
+       IPS."
 
      * To use a standard tar binary installation, use the notes
-       provided in Section 2.2, "Installing MySQL on Unix/Linux Using
-       Generic Binaries." Check the notes and hints at the end of
-       this section for Solaris specific notes that you may need
-       before or after installation.
+       provided in Section 2.2, "Installing MySQL on Unix/Linux
+       Using Generic Binaries." Check the notes and hints at the
+       end of this section for Solaris specific notes that you
+       may need before or after installation.
 
-   To obtain a binary MySQL distribution for Solaris in tarball or
-   PKG format, http://dev.mysql.com/downloads/mysql/5.5.html.
+   To obtain a binary MySQL distribution for Solaris in tarball
+   or PKG format, http://dev.mysql.com/downloads/mysql/5.5.html.
 
-   Additional notes to be aware of when installing and using MySQL on
-   Solaris:
+   Additional notes to be aware of when installing and using
+   MySQL on Solaris:
 
-     * If you want to use MySQL with the mysql user and group, use
-       the groupadd and useradd commands:
+     * If you want to use MySQL with the mysql user and group,
+       use the groupadd and useradd commands:
 groupadd mysql
 useradd -g mysql mysql
 
-     * If you install MySQL using a binary tarball distribution on
-       Solaris, you may run into trouble even before you get the
-       MySQL distribution unpacked, as the Solaris tar cannot handle
-       long file names. This means that you may see errors when you
-       try to unpack MySQL.
-       If this occurs, you must use GNU tar (gtar) to unpack the
-       distribution. In Solaris 10 and OpenSolaris gtar is normally
-       located in /usr/sfw/bin/gtar, but may not be included in the
-       default path definition.
-
-     * When using Solaris 10 for x86_64, you should mount any file
-       systems on which you intend to store InnoDB files with the
-       forcedirectio option. (By default mounting is done without
-       this option.) Failing to do so will cause a significant drop
-       in performance when using the InnoDB storage engine on this
-       platform.
 
-     * If you would like MySQL to start automatically, you can copy
-       support-files/mysql.server to /etc/init.d and create a
-       symbolic link to it named /etc/rc3.d/S99mysql.server.
+     * If you install MySQL using a binary tarball distribution
+       on Solaris, you may run into trouble even before you get
+       the MySQL distribution unpacked, as the Solaris tar
+       cannot handle long file names. This means that you may
+       see errors when you try to unpack MySQL.
+       If this occurs, you must use GNU tar (gtar) to unpack the
+       distribution. In Solaris 10 and OpenSolaris gtar is
+       normally located in /usr/sfw/bin/gtar, but may not be
+       included in the default path definition.
+
+     * When using Solaris 10 for x86_64, you should mount any
+       file systems on which you intend to store InnoDB files
+       with the forcedirectio option. (By default mounting is
+       done without this option.) Failing to do so will cause a
+       significant drop in performance when using the InnoDB
+       storage engine on this platform.
+
+     * If you would like MySQL to start automatically, you can
+       copy support-files/mysql.server to /etc/init.d and create
+       a symbolic link to it named /etc/rc3.d/S99mysql.server.
 
-     * If too many processes try to connect very rapidly to mysqld,
-       you should see this error in the MySQL log:
+     * If too many processes try to connect very rapidly to
+       mysqld, you should see this error in the MySQL log:
 Error in accept: Protocol error
+
        You might try starting the server with the --back_log=50
        option as a workaround for this.
 
      * To configure the generation of core files on Solaris you
        should use the coreadm command. Because of the security
-       implications of generating a core on a setuid() application,
-       by default, Solaris does not support core files on setuid()
-       programs. However, you can modify this behavior using coreadm.
-       If you enable setuid() core files for the current user, they
-       will be generated using the mode 600 and owned by the
-       superuser.
+       implications of generating a core on a setuid()
+       application, by default, Solaris does not support core
+       files on setuid() programs. However, you can modify this
+       behavior using coreadm. If you enable setuid() core files
+       for the current user, they will be generated using the
+       mode 600 and owned by the superuser.
 
 2.7.1 Installing MySQL on Solaris Using a Solaris PKG
 
-   You can install MySQL on Solaris and OpenSolaris using a binary
-   package using the native Solaris PKG format instead of the binary
-   tarball distribution.
+   You can install MySQL on Solaris and OpenSolaris using a
+   binary package using the native Solaris PKG format instead of
+   the binary tarball distribution.
 
    To use this package, download the corresponding
-   mysql-VERSION-solaris10-PLATFORM.pkg.gz file, then uncompress it.
-   For example:
-shell> gunzip mysql-5.5.41-solaris10-x86_64.pkg.gz
+   mysql-VERSION-solaris10-PLATFORM.pkg.gz file, then uncompress
+   it. For example:
+shell> gunzip mysql-5.5.42-solaris10-x86_64.pkg.gz
 
    To install a new package, use pkgadd and follow the onscreen
-   prompts. You must have root privileges to perform this operation:
-shell> pkgadd -d mysql-5.5.41-solaris10-x86_64.pkg
+   prompts. You must have root privileges to perform this
+   operation:
+shell> pkgadd -d mysql-5.5.42-solaris10-x86_64.pkg
 
 The following packages are available:
   1  mysql     MySQL Community Server (GPL)
-               (i86pc) 5.5.41
+               (i86pc) 5.5.42
 
 Select package(s) you wish to process (or 'all' to process
 all packages). (default: all) [?,??,q]:
 
-   The PKG installer installs all of the files and tools needed, and
-   then initializes your database if one does not exist. To complete
-   the installation, you should set the root password for MySQL as
-   provided in the instructions at the end of the installation.
-   Alternatively, you can run the mysql_secure_installation script
-   that comes with the installation.
-
-   By default, the PKG package installs MySQL under the root path
-   /opt/mysql. You can change only the installation root path when
-   using pkgadd, which can be used to install MySQL in a different
-   Solaris zone. If you need to install in a specific directory, use
-   a binary tar file distribution.
-
-   The pkg installer copies a suitable startup script for MySQL into
-   /etc/init.d/mysql. To enable MySQL to startup and shutdown
-   automatically, you should create a link between this file and the
-   init script directories. For example, to ensure safe startup and
-   shutdown of MySQL you could use the following commands to add the
-   right links:
+   The PKG installer installs all of the files and tools needed,
+   and then initializes your database if one does not exist. To
+   complete the installation, you should set the root password
+   for MySQL as provided in the instructions at the end of the
+   installation. Alternatively, you can run the
+   mysql_secure_installation script that comes with the
+   installation.
+
+   By default, the PKG package installs MySQL under the root
+   path /opt/mysql. You can change only the installation root
+   path when using pkgadd, which can be used to install MySQL in
+   a different Solaris zone. If you need to install in a
+   specific directory, use a binary tar file distribution.
+
+   The pkg installer copies a suitable startup script for MySQL
+   into /etc/init.d/mysql. To enable MySQL to startup and
+   shutdown automatically, you should create a link between this
+   file and the init script directories. For example, to ensure
+   safe startup and shutdown of MySQL you could use the
+   following commands to add the right links:
 shell> ln /etc/init.d/mysql /etc/rc3.d/S91mysql
 shell> ln /etc/init.d/mysql /etc/rc0.d/K02mysql
 
-   To remove MySQL, the installed package name is mysql. You can use
-   this in combination with the pkgrm command to remove the
+   To remove MySQL, the installed package name is mysql. You can
+   use this in combination with the pkgrm command to remove the
    installation.
 
-   To upgrade when using the Solaris package file format, you must
-   remove the existing installation before installing the updated
-   package. Removal of the package does not delete the existing
-   database information, only the server, binaries and support files.
-   The typical upgrade sequence is therefore:
+   To upgrade when using the Solaris package file format, you
+   must remove the existing installation before installing the
+   updated package. Removal of the package does not delete the
+   existing database information, only the server, binaries and
+   support files. The typical upgrade sequence is therefore:
 shell> mysqladmin shutdown
 shell> pkgrm mysql
-shell> pkgadd -d mysql-5.5.41-solaris10-x86_64.pkg
+shell> pkgadd -d mysql-5.5.42-solaris10-x86_64.pkg
 shell> mysqld_safe &
 shell> mysql_upgrade
 
@@ -5013,68 +5643,70 @@ shell> mysql_upgrade
 2.7.2 Installing MySQL on OpenSolaris Using IPS
 
    OpenSolaris includes standard packages for MySQL in the core
-   repository. The MySQL packages are based on a specific release of
-   MySQL and updated periodically. For the latest release you must
-   use either the native Solaris PKG, tar, or source installations.
-   The native OpenSolaris packages include SMF files so that you can
-   easily control your MySQL installation, including automatic
-   startup and recovery, using the native service management tools.
-
-   To install MySQL on OpenSolaris, use the pkg command. You will
-   need to be logged in as root, or use the pfexec tool, as shown in
-   the example below:
+   repository. The MySQL packages are based on a specific
+   release of MySQL and updated periodically. For the latest
+   release you must use either the native Solaris PKG, tar, or
+   source installations. The native OpenSolaris packages include
+   SMF files so that you can easily control your MySQL
+   installation, including automatic startup and recovery, using
+   the native service management tools.
+
+   To install MySQL on OpenSolaris, use the pkg command. You
+   will need to be logged in as root, or use the pfexec tool, as
+   shown in the example below:
 shell> pfexec pkg install SUNWmysql55
 
    The package set installs three individual packages,
    SUNWmysql55lib, which contains the MySQL client libraries;
-   SUNWmysql55r which contains the root components, including SMF and
-   configuration files; and SUNWmysql55u which contains the scripts,
-   binary tools and other files. You can install these packages
-   individually if you only need the corresponding components.
-
-   The MySQL files are installed into /usr/mysql which symbolic links
-   for the sub directories (bin, lib, etc.) to a version specific
-   directory. For MySQL 5.5, the full installation is located in
-   /usr/mysql/5.5. The default data directory is /var/mysql/5.5/data.
-   The configuration file is installed in /etc/mysql/5.5/my.cnf. This
-   layout permits multiple versions of MySQL to be installed, without
-   overwriting the data and binaries from other versions.
-
-   Once installed, you must run mysql_install_db to initialize the
-   database, and use the mysql_secure_installation to secure your
-   installation.
+   SUNWmysql55r which contains the root components, including
+   SMF and configuration files; and SUNWmysql55u which contains
+   the scripts, binary tools and other files. You can install
+   these packages individually if you only need the
+   corresponding components.
+
+   The MySQL files are installed into /usr/mysql which symbolic
+   links for the sub directories (bin, lib, etc.) to a version
+   specific directory. For MySQL 5.5, the full installation is
+   located in /usr/mysql/5.5. The default data directory is
+   /var/mysql/5.5/data. The configuration file is installed in
+   /etc/mysql/5.5/my.cnf. This layout permits multiple versions
+   of MySQL to be installed, without overwriting the data and
+   binaries from other versions.
+
+   Once installed, you must run mysql_install_db to initialize
+   the database, and use the mysql_secure_installation to secure
+   your installation.
 
 Using SMF to manage your MySQL installation
 
-   Once installed, you can start and stop your MySQL server using the
-   installed SMF configuration. The service name is mysql, or if you
-   have multiple versions installed, you should use the full version
-   name, for example mysql:version_55. To start and enable MySQL to
-   be started at boot time:
+   Once installed, you can start and stop your MySQL server
+   using the installed SMF configuration. The service name is
+   mysql, or if you have multiple versions installed, you should
+   use the full version name, for example mysql:version_55. To
+   start and enable MySQL to be started at boot time:
 shell> svcadm enable mysql
 
    To disable MySQL from starting during boot time, and shut the
    MySQL server down if it is running, use:
 shell> svcadm disable mysql
 
-   To restart MySQL, for example after a configuration file changes,
-   use the restart option:
+   To restart MySQL, for example after a configuration file
+   changes, use the restart option:
 shell> svcadm restart mysql
 
-   You can also use SMF to configure the data directory and enable
-   full 64-bit mode. For example, to set the data directory used by
-   MySQL:
-shell> svccfg 
-svc:> select mysql:version_55 
-svc:/application/database/mysql:version_55> setprop mysql/data=/data0
-/mysql
-
+   You can also use SMF to configure the data directory and
+   enable full 64-bit mode. For example, to set the data
+   directory used by MySQL:
+shell> svccfg
+svc:> select mysql:version_55
+svc:/application/database/mysql:version_55> setprop mysql/data=/data0/
+mysql
 
-   By default, the 32-bit binaries are used. To enable the 64-bit
-   server on 64-bit platforms, set the enable_64bit parameter. For
-   example:
-svc:/application/database/mysql:version_55> setprop mysql/enable_64bi
-t=1
+   By default, the 32-bit binaries are used. To enable the
+   64-bit server on 64-bit platforms, set the enable_64bit
+   parameter. For example:
+svc:/application/database/mysql:version_55> setprop mysql/enable_64bit
+=1
 
    You need to refresh the SMF after settings these options:
 shell> svcadm refresh mysql
@@ -5084,17 +5716,18 @@ shell> svcadm refresh mysql
    This section provides information about installing MySQL on
    variants of FreeBSD Unix.
 
-   You can install MySQL on FreeBSD by using the binary distribution
-   provided by Oracle. For more information, see Section 2.2,
-   "Installing MySQL on Unix/Linux Using Generic Binaries."
-
-   The easiest (and preferred) way to install MySQL is to use the
-   mysql-server and mysql-client ports available at
-   http://www.freebsd.org/. Using these ports gives you the following
-   benefits:
+   You can install MySQL on FreeBSD by using the binary
+   distribution provided by Oracle. For more information, see
+   Section 2.2, "Installing MySQL on Unix/Linux Using Generic
+   Binaries."
+
+   The easiest (and preferred) way to install MySQL is to use
+   the mysql-server and mysql-client ports available at
+   http://www.freebsd.org/. Using these ports gives you the
+   following benefits:
 
-     * A working MySQL with all optimizations enabled that are known
-       to work on your version of FreeBSD.
+     * A working MySQL with all optimizations enabled that are
+       known to work on your version of FreeBSD.
 
      * Automatic configuration and build.
 
@@ -5103,12 +5736,12 @@ shell> svcadm refresh mysql
      * The ability to use pkg_info -L to see which files are
        installed.
 
-     * The ability to use pkg_delete to remove MySQL if you no longer
-       want it on your machine.
+     * The ability to use pkg_delete to remove MySQL if you no
+       longer want it on your machine.
 
-   The MySQL build process requires GNU make (gmake) to work. If GNU
-   make is not available, you must install it first before compiling
-   MySQL.
+   The MySQL build process requires GNU make (gmake) to work. If
+   GNU make is not available, you must install it first before
+   compiling MySQL.
 
    To install using the ports system:
 # cd /usr/ports/databases/mysql51-server
@@ -5119,12 +5752,13 @@ shell> svcadm refresh mysql
 ...
 
    The standard port installation places the server into
-   /usr/local/libexec/mysqld, with the startup script for the MySQL
-   server placed in /usr/local/etc/rc.d/mysql-server.
+   /usr/local/libexec/mysqld, with the startup script for the
+   MySQL server placed in /usr/local/etc/rc.d/mysql-server.
 
    Some additional notes on the BSD implementation:
 
-     * To remove MySQL after installation using the ports system:
+     * To remove MySQL after installation using the ports
+       system:
 # cd /usr/ports/databases/mysql51-server
 # make deinstall
 ...
@@ -5132,205 +5766,230 @@ shell> svcadm refresh mysql
 # make deinstall
 ...
 
-     * If you get problems with the current date in MySQL, setting
-       the TZ variable should help. See Section 2.12, "Environment
-       Variables."
+
+     * If you get problems with the current date in MySQL,
+       setting the TZ variable should help. See Section 2.12,
+       "Environment Variables."
 
 2.9 Installing MySQL from Source
 
-   Building MySQL from the source code enables you to customize build
-   parameters, compiler optimizations, and installation location. For
-   a list of systems on which MySQL is known to run, see
-   http://www.mysql.com/support/supportedplatforms/database.html.
-
-   Before you proceed with an installation from source, check whether
-   Oracle produces a precompiled binary distribution for your
-   platform and whether it works for you. We put a great deal of
-   effort into ensuring that our binaries are built with the best
-   possible options for optimal performance. Instructions for
-   installing binary distributions are available in Section 2.2,
-   "Installing MySQL on Unix/Linux Using Generic Binaries."
-   Note
-
-   This section describes how to build MySQL from source using CMake.
-   Before MySQL 5.5, source builds used the GNU autotools on
-   Unix-like systems. Source builds on Windows used CMake, but the
-   process was different from that described here. For
+   Building MySQL from the source code enables you to customize
+   build parameters, compiler optimizations, and installation
+   location. For a list of systems on which MySQL is known to
+   run, see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
+
+   Before you proceed with an installation from source, check
+   whether Oracle produces a precompiled binary distribution for
+   your platform and whether it works for you. We put a great
+   deal of effort into ensuring that our binaries are built with
+   the best possible options for optimal performance.
+   Instructions for installing binary distributions are
+   available in Section 2.2, "Installing MySQL on Unix/Linux
+   Using Generic Binaries."
+   Note
+
+   This section describes how to build MySQL from source using
+   CMake. Before MySQL 5.5, source builds used the GNU autotools
+   on Unix-like systems. Source builds on Windows used CMake,
+   but the process was different from that described here. For
    source-building instructions for older versions of MySQL, see
    Installing MySQL from Source
-   (http://dev.mysql.com/doc/refman/5.1/en/source-installation.html),
-   in the MySQL 5.1 Reference Manual. If you are familiar with
-   autotools but not CMake, you might find these transition
+   (http://dev.mysql.com/doc/refman/5.1/en/source-installation.h
+   tml), in the MySQL 5.1 Reference Manual. If you are familiar
+   with autotools but not CMake, you might find these transition
    instructions helpful: Autotools to CMake Transition Guide
-   (http://dev.mysql.com/doc/internals/en/autotools-to-cmake.html)
+   (http://dev.mysql.com/doc/internals/en/autotools-to-cmake.htm
+   l)
 
 Source Installation Methods
 
    There are two methods for installing MySQL from source:
 
-     * Use a standard MySQL source distribution. To obtain a standard
-       distribution, see Section 2.1.3, "How to Get MySQL." For
-       instructions on building from a standard distribution, see
-       Section 2.9.2, "Installing MySQL Using a Standard Source
-       Distribution."
-       Standard distributions are available as compressed tar files,
-       Zip archives, or RPM packages. Distribution files have names
-       of the form mysql-VERSION.tar.gz, mysql-VERSION.zip, or
-       mysql-VERSION.rpm, where VERSION is a number like 5.5.41. File
-       names for source distributions can be distinguished from those
-       for precompiled binary distributions in that source
-       distribution names are generic and include no platform name,
-       whereas binary distribution names include a platform name
-       indicating the type of system for which the distribution is
-       intended (for example, pc-linux-i686 or winx64).
-
-     * Use a MySQL development tree. Development trees have not
-       necessarily received the same level of testing as standard
-       release distributions, so this installation method is usually
-       required only if you need the most recent code changes. For
-       information on building from one of the development trees, see
-       Section 2.9.3, "Installing MySQL Using a Development Source
-       Tree."
+     * Use a standard MySQL source distribution. To obtain a
+       standard distribution, see Section 2.1.3, "How to Get
+       MySQL." For instructions on building from a standard
+       distribution, see Section 2.9.2, "Installing MySQL Using
+       a Standard Source Distribution."
+       Standard distributions are available as compressed tar
+       files, Zip archives, or RPM packages. Distribution files
+       have names of the form mysql-VERSION.tar.gz,
+       mysql-VERSION.zip, or mysql-VERSION.rpm, where VERSION is
+       a number like 5.5.42. File names for source distributions
+       can be distinguished from those for precompiled binary
+       distributions in that source distribution names are
+       generic and include no platform name, whereas binary
+       distribution names include a platform name indicating the
+       type of system for which the distribution is intended
+       (for example, pc-linux-i686 or winx64).
+
+     * Use a MySQL development tree. For information on building
+       from one of the development trees, see Section 2.9.3,
+       "Installing MySQL Using a Development Source Tree."
 
 Source Installation System Requirements
 
-   Installation of MySQL from source requires several development
-   tools. Some of these tools are needed no matter whether you use a
-   standard source distribution or a development source tree. Other
-   tool requirements depend on which installation method you use.
-
-   To install MySQL from source, your system must have the following
-   tools, regardless of installation method:
-
-     * CMake, which is used as the build framework on all platforms.
-       CMake can be downloaded from http://www.cmake.org.
-
-     * A good make program. Although some platforms come with their
-       own make implementations, it is highly recommended that you
-       use GNU make 3.75 or newer. It may already be available on
-       your system as gmake. GNU make is available from
-       http://www.gnu.org/software/make/.
-
-     * A working ANSI C++ compiler. GCC 4.2.1 or later, Sun Studio 12
-       or later, Visual Studio 2008 or later, and many current
-       vendor-supplied compilers are known to work.
+   Installation of MySQL from source requires several
+   development tools. Some of these tools are needed no matter
+   whether you use a standard source distribution or a
+   development source tree. Other tool requirements depend on
+   which installation method you use.
+
+   To install MySQL from source, your system must have the
+   following tools, regardless of installation method:
+
+     * CMake, which is used as the build framework on all
+       platforms. CMake can be downloaded from
+       http://www.cmake.org.
+
+     * A good make program. Although some platforms come with
+       their own make implementations, it is highly recommended
+       that you use GNU make 3.75 or newer. It may already be
+       available on your system as gmake. GNU make is available
+       from http://www.gnu.org/software/make/.
+
+     * A working ANSI C++ compiler. GCC 4.2.1 or later, Sun
+       Studio 12 or later, Visual Studio 2008 or later, and many
+       current vendor-supplied compilers are known to work.
 
      * Perl is needed if you intend to run test scripts. Most
        Unix-like systems include Perl. On Windows, you can use a
        version such as ActiveState Perl.
 
-   To install MySQL from a standard source distribution, one of the
-   following tools is required to unpack the distribution file:
+   To install MySQL from a standard source distribution, one of
+   the following tools is required to unpack the distribution
+   file:
+
+     * For a .tar.gz compressed tar file: GNU gunzip to
+       uncompress the distribution and a reasonable tar to
+       unpack it. If your tar program supports the z option, it
+       can both uncompress and unpack the file.
+       GNU tar is known to work. The standard tar provided with
+       some operating systems is not able to unpack the long
+       file names in the MySQL distribution. You should download
+       and install GNU tar, or if available, use a preinstalled
+       version of GNU tar. Usually this is available as gnutar,
+       gtar, or as tar within a GNU or Free Software directory,
+       such as /usr/sfw/bin or /usr/local/bin. GNU tar is
+       available from http://www.gnu.org/software/tar/.
+
+     * For a .zip Zip archive: WinZip or another tool that can
+       read .zip files.
+
+     * For an .rpm RPM package: The rpmbuild program used to
+       build the distribution unpacks it.
 
-     * For a .tar.gz compressed tar file: GNU gunzip to uncompress
-       the distribution and a reasonable tar to unpack it. If your
-       tar program supports the z option, it can both uncompress and
-       unpack the file.
-       GNU tar is known to work. The standard tar provided with some
-       operating systems is not able to unpack the long file names in
-       the MySQL distribution. You should download and install GNU
-       tar, or if available, use a preinstalled version of GNU tar.
-       Usually this is available as gnutar, gtar, or as tar within a
-       GNU or Free Software directory, such as /usr/sfw/bin or
-       /usr/local/bin. GNU tar is available from
-       http://www.gnu.org/software/tar/.
-
-     * For a .zip Zip archive: WinZip or another tool that can read
-       .zip files.
-
-     * For an .rpm RPM package: The rpmbuild program used to build
-       the distribution unpacks it.
-
-   To install MySQL from a development source tree, the following
-   additional tools are required:
-
-     * To obtain the source tree, you must have Bazaar installed. The
-       Bazaar VCS Web site (http://bazaar-vcs.org) has instructions
-       for downloading and installing Bazaar on different platforms.
-       Bazaar is supported on any platform that supports Python, and
-       is therefore compatible with any Linux, Unix, Windows, or Mac
-       OS X host.
-
-     * bison is needed to generate sql_yacc.cc from sql_yacc.yy You
-       should use the latest version of bison where possible.
-       Versions 1.75 and 2.1 are known to work. There have been
-       reported problems with bison 1.875. If you experience
-       problems, upgrade to a later, rather than earlier, version.
-       bison is available from http://www.gnu.org/software/bison/.
-       bison for Windows can be downloaded from
-       http://gnuwin32.sourceforge.net/packages/bison.htm. Download
-       the package labeled "Complete package, excluding sources". On
-       Windows, the default location for bison is the C:\Program
-       Files\GnuWin32 directory. Some utilities may fail to find
-       bison because of the space in the directory name. Also, Visual
-       Studio may simply hang if there are spaces in the path. You
-       can resolve these problems by installing into a directory that
-       does not contain a space; for example C:\GnuWin32.
+   To install MySQL from a development source tree, the
+   following additional tools are required:
 
-     * On OpenSolaris and Solaris Express, m4 must be installed in
-       addition to bison. m4 is available from
+     * One of the following revision control systems is required
+       to obtain the development source code:
+
+          + Git: The GitHub Help (https://help.github.com/)
+            provides instructions for downloading and installing
+            Git on different platforms. MySQL officially joined
+            GitHub in September, 2014. For more information
+            about MySQL's move to GitHub, refer to the
+            announcement on the MySQL Release Engineering blog:
+            MySQL on GitHub
+            (http://mysqlrelease.com/2014/09/mysql-on-github/)
+
+          + Bazaar: The Bazaar VCS Web site
+            (http://bazaar-vcs.org) provides instructions for
+            downloading and installing Bazaar on different
+            platforms. Bazaar is supported on any platform that
+            supports Python, and is therefore compatible with
+            any Linux, Unix, Windows, or Mac OS X host.
+
+     * bison 2.1 or newer, available from
+       http://www.gnu.org/software/bison/. (Version 1 is no
+       longer supported.) Use the latest version of bison where
+       possible; if you experience problems, upgrade to a later
+       version, rather than revert to an earlier one.
+       bison is available from
+       http://www.gnu.org/software/bison/. bison for Windows can
+       be downloaded from
+       http://gnuwin32.sourceforge.net/packages/bison.htm.
+       Download the package labeled "Complete package, excluding
+       sources". On Windows, the default location for bison is
+       the C:\Program Files\GnuWin32 directory. Some utilities
+       may fail to find bison because of the space in the
+       directory name. Also, Visual Studio may simply hang if
+       there are spaces in the path. You can resolve these
+       problems by installing into a directory that does not
+       contain a space; for example C:\GnuWin32.
+
+     * On OpenSolaris and Solaris Express, m4 must be installed
+       in addition to bison. m4 is available from
        http://www.gnu.org/software/m4/.
 
    Note
 
-   If you have to install any programs, modify your PATH environment
-   variable to include any directories in which the programs are
-   located. See Section 4.2.10, "Setting Environment Variables."
+   If you have to install any programs, modify your PATH
+   environment variable to include any directories in which the
+   programs are located. See Section 4.2.10, "Setting
+   Environment Variables."
 
-   If you run into problems and need to file a bug report, please use
-   the instructions in Section 1.7, "How to Report Bugs or Problems."
+   If you run into problems and need to file a bug report,
+   please use the instructions in Section 1.7, "How to Report
+   Bugs or Problems."
 
 2.9.1 MySQL Layout for Source Installation
 
-   By default, when you install MySQL after compiling it from source,
-   the installation step installs files under /usr/local/mysql. The
-   component locations under the installation directory are the same
-   as for binary distributions. See Section 2.2, "MySQL Installation
-   Layout for Generic Unix/Linux Binary Package," and Section 2.3.1,
-   "MySQL Installation Layout on Microsoft Windows." To configure
-   installation locations different from the defaults, use the
-   options described at Section 2.9.4, "MySQL Source-Configuration
-   Options."
+   By default, when you install MySQL after compiling it from
+   source, the installation step installs files under
+   /usr/local/mysql. The component locations under the
+   installation directory are the same as for binary
+   distributions. See Section 2.2, "MySQL Installation Layout
+   for Generic Unix/Linux Binary Package," and Section 2.3.1,
+   "MySQL Installation Layout on Microsoft Windows." To
+   configure installation locations different from the defaults,
+   use the options described at Section 2.9.4, "MySQL
+   Source-Configuration Options."
 
 2.9.2 Installing MySQL Using a Standard Source Distribution
 
    To install MySQL from a standard source distribution:
 
-    1. Verify that your system satisfies the tool requirements listed
-       at Section 2.9, "Installing MySQL from Source."
+    1. Verify that your system satisfies the tool requirements
+       listed at Section 2.9, "Installing MySQL from Source."
 
-    2. Obtain a distribution file using the instructions in Section
-       2.1.3, "How to Get MySQL."
+    2. Obtain a distribution file using the instructions in
+       Section 2.1.3, "How to Get MySQL."
 
     3. Configure, build, and install the distribution using the
        instructions in this section.
 
-    4. Perform postinstallation procedures using the instructions in
-       Section 2.10, "Postinstallation Setup and Testing."
+    4. Perform postinstallation procedures using the
+       instructions in Section 2.10, "Postinstallation Setup and
+       Testing."
 
    In MySQL 5.5, CMake is used as the build framework on all
    platforms. The instructions given here should enable you to
    produce a working installation. For additional information on
-   using CMake to build MySQL, see How to Build MySQL Server with
-   CMake (http://dev.mysql.com/doc/internals/en/cmake.html).
-
-   If you start from a source RPM, use the following command to make
-   a binary RPM that you can install. If you do not have rpmbuild,
-   use rpm instead.
+   using CMake to build MySQL, see How to Build MySQL Server
+   with CMake
+   (http://dev.mysql.com/doc/internals/en/cmake.html).
+
+   If you start from a source RPM, use the following command to
+   make a binary RPM that you can install. If you do not have
+   rpmbuild, use rpm instead.
 shell> rpmbuild --rebuild --clean MySQL-VERSION.src.rpm
 
-   The result is one or more binary RPM packages that you install as
-   indicated in Section 2.5.1, "Installing MySQL on Linux Using RPM
-   Packages."
-
-   The sequence for installation from a compressed tar file or Zip
-   archive source distribution is similar to the process for
-   installing from a generic binary distribution (see Section 2.2,
-   "Installing MySQL on Unix/Linux Using Generic Binaries"), except
-   that it is used on all platforms and includes steps to configure
-   and compile the distribution. For example, with a compressed tar
-   file source distribution on Unix, the basic installation command
-   sequence looks like this:
+   The result is one or more binary RPM packages that you
+   install as indicated in Section 2.5.1, "Installing MySQL on
+   Linux Using RPM Packages."
+
+   The sequence for installation from a compressed tar file or
+   Zip archive source distribution is similar to the process for
+   installing from a generic binary distribution (see Section
+   2.2, "Installing MySQL on Unix/Linux Using Generic
+   Binaries"), except that it is used on all platforms and
+   includes steps to configure and compile the distribution. For
+   example, with a compressed tar file source distribution on
+   Unix, the basic installation command sequence looks like
+   this:
 # Preconfiguration setup
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
@@ -5354,45 +6013,49 @@ shell> bin/mysqld_safe --user=mysql &
 # Next command is optional
 shell> cp support-files/mysql.server /etc/init.d/mysql.server
 
-   A more detailed version of the source-build specific instructions
-   is shown following.
+   A more detailed version of the source-build specific
+   instructions is shown following.
    Note
 
-   The procedure shown here does not set up any passwords for MySQL
-   accounts. After following the procedure, proceed to Section 2.10,
-   "Postinstallation Setup and Testing," for postinstallation setup
-   and testing.
+   The procedure shown here does not set up any passwords for
+   MySQL accounts. After following the procedure, proceed to
+   Section 2.10, "Postinstallation Setup and Testing," for
+   postinstallation setup and testing.
 
 Perform Preconfiguration Setup
 
-   On Unix, set up the mysql user and group that will be used to run
-   and execute the MySQL server and own the database directory. For
-   details, see Creating a mysql System User and Group, in Section
-   2.2, "Installing MySQL on Unix/Linux Using Generic Binaries." Then
-   perform the following steps as the mysql user, except as noted.
+   On Unix, set up the mysql user and group that will be used to
+   run and execute the MySQL server and own the database
+   directory. For details, see Creating a mysql System User and
+   Group, in Section 2.2, "Installing MySQL on Unix/Linux Using
+   Generic Binaries." Then perform the following steps as the
+   mysql user, except as noted.
 
 Obtain and Unpack the Distribution
 
-   Pick the directory under which you want to unpack the distribution
-   and change location into it.
+   Pick the directory under which you want to unpack the
+   distribution and change location into it.
 
    Obtain a distribution file using the instructions in Section
    2.1.3, "How to Get MySQL."
 
    Unpack the distribution into the current directory:
 
-     * To unpack a compressed tar file, tar can uncompress and unpack
-       the distribution if it has z option support:
+     * To unpack a compressed tar file, tar can uncompress and
+       unpack the distribution if it has z option support:
 shell> tar zxvf mysql-VERSION.tar.gz
+
        If your tar does not have z option support, use gunzip to
        unpack the distribution and tar to unpack it:
 shell> gunzip < mysql-VERSION.tar.gz | tar xvf -
+
        Alternatively, CMake can uncompress and unpack the
        distribution:
 shell> cmake -E tar zxvf mysql-VERSION.tar.gz
 
-     * To unpack a Zip archive, use WinZip or another tool that can
-       read .zip files.
+
+     * To unpack a Zip archive, use WinZip or another tool that
+       can read .zip files.
 
    Unpacking the distribution file creates a directory named
    mysql-VERSION.
@@ -5403,36 +6066,40 @@ Configure the Distribution
    distribution:
 shell> cd mysql-VERSION
 
-   Configure the source directory. The minimum configuration command
-   includes no options to override configuration defaults:
+   Configure the source directory. The minimum configuration
+   command includes no options to override configuration
+   defaults:
 shell> cmake .
 
-   On Windows, specify the development environment. For example, the
-   following commands configure MySQL for 32-bit or 64-bit builds,
-   respectively:
+   On Windows, specify the development environment. For example,
+   the following commands configure MySQL for 32-bit or 64-bit
+   builds, respectively:
 shell> cmake . -G "Visual Studio 9 2008"
 shell> cmake . -G "Visual Studio 9 2008 Win64"
 
    On Mac OS X, to use the Xcode IDE:
 shell> cmake . -G Xcode
 
-   When you run cmake, you might want to add options to the command
-   line. Here are some examples:
+   When you run cmake, you might want to add options to the
+   command line. Here are some examples:
 
-     * -DBUILD_CONFIG=mysql_release: Configure the source with the
-       same build options used by Oracle to produce binary
+     * -DBUILD_CONFIG=mysql_release: Configure the source with
+       the same build options used by Oracle to produce binary
        distributions for official MySQL releases.
 
-     * -DCMAKE_INSTALL_PREFIX=dir_name: Configure the distribution
-       for installation under a particular location.
+     * -DCMAKE_INSTALL_PREFIX=dir_name: Configure the
+       distribution for installation under a particular
+       location.
 
-     * -DCPACK_MONOLITHIC_INSTALL=1: Cause make package to generate a
-       single installation file rather than multiple files.
+     * -DCPACK_MONOLITHIC_INSTALL=1: Cause make package to
+       generate a single installation file rather than multiple
+       files.
 
-     * -DWITH_DEBUG=1: Build the distribution with debugging support.
+     * -DWITH_DEBUG=1: Build the distribution with debugging
+       support.
 
-   For a more extensive list of options, see Section 2.9.4, "MySQL
-   Source-Configuration Options."
+   For a more extensive list of options, see Section 2.9.4,
+   "MySQL Source-Configuration Options."
 
    To list the configuration options, use one of the following
    commands:
@@ -5441,24 +6108,26 @@ shell> cmake . -LH  # overview with help
 shell> cmake . -LAH # all params with help text
 shell> ccmake .     # interactive display
 
-   If CMake fails, you might need to reconfigure by running it again
-   with different options. If you do reconfigure, take note of the
-   following:
-
-     * If CMake is run after it has previously been run, it may use
-       information that was gathered during its previous invocation.
-       This information is stored in CMakeCache.txt. When CMake
-       starts up, it looks for that file and reads its contents if it
-       exists, on the assumption that the information is still
-       correct. That assumption is invalid when you reconfigure.
-
-     * Each time you run CMake, you must run make again to recompile.
-       However, you may want to remove old object files from previous
-       builds first because they were compiled using different
-       configuration options.
+   If CMake fails, you might need to reconfigure by running it
+   again with different options. If you do reconfigure, take
+   note of the following:
+
+     * If CMake is run after it has previously been run, it may
+       use information that was gathered during its previous
+       invocation. This information is stored in CMakeCache.txt.
+       When CMake starts up, it looks for that file and reads
+       its contents if it exists, on the assumption that the
+       information is still correct. That assumption is invalid
+       when you reconfigure.
+
+     * Each time you run CMake, you must run make again to
+       recompile. However, you may want to remove old object
+       files from previous builds first because they were
+       compiled using different configuration options.
 
    To prevent old object files or configuration information from
-   being used, run these commands on Unix before re-running CMake:
+   being used, run these commands on Unix before re-running
+   CMake:
 shell> make clean
 shell> rm CMakeCache.txt
 
@@ -5468,14 +6137,14 @@ shell> del CMakeCache.txt
 
    If you build out of the source tree (as described later), the
    CMakeCache.txt file and all built files are in the build
-   directory, so you can remove that directory to object files and
-   cached configuration information.
+   directory, so you can remove that directory to object files
+   and cached configuration information.
 
-   If you are going to send mail to a MySQL mailing list to ask for
-   configuration assistance, first check the files in the CMakeFiles
-   directory for useful information about the failure. To file a bug
-   report, please use the instructions in Section 1.7, "How to Report
-   Bugs or Problems."
+   If you are going to send mail to a MySQL mailing list to ask
+   for configuration assistance, first check the files in the
+   CMakeFiles directory for useful information about the
+   failure. To file a bug report, please use the instructions in
+   Section 1.7, "How to Report Bugs or Problems."
 
 Build the Distribution
 
@@ -5486,46 +6155,49 @@ shell> make VERBOSE=1
    The second command sets VERBOSE to show the commands for each
    compiled source.
 
-   Use gmake instead on systems where you are using GNU make and it
-   has been installed as gmake.
+   Use gmake instead on systems where you are using GNU make and
+   it has been installed as gmake.
 
    On Windows:
 shell> devenv MySQL.sln /build RelWithDebInfo
 
-   It is possible to build out of the source tree to keep the tree
-   clean. If the top-level source directory is named mysql-src under
-   your current working directory, you can build in a directory named
-   bld at the same level like this:
+   It is possible to build out of the source tree to keep the
+   tree clean. If the top-level source directory is named
+   mysql-src under your current working directory, you can build
+   in a directory named bld at the same level like this:
 shell> mkdir bld
 shell> cd bld
 shell> cmake ../mysql-src
 
-   The build directory need not actually be outside the source tree.
-   For example, to build in a directory, you can build in a directory
-   named bld under the top-level source tree, do this, starting with
-   mysql-src as your current working directory:
+   The build directory need not actually be outside the source
+   tree. For example, to build in a directory, you can build in
+   a directory named bld under the top-level source tree, do
+   this, starting with mysql-src as your current working
+   directory:
 shell> mkdir bld
 shell> cd bld
 shell> cmake ..
 
-   If you have multiple source trees at the same level (for example,
-   to build multiple versions of MySQL), the second strategy can be
-   advantageous. The first strategy places all build directories at
-   the same level, which requires that you choose a unique name for
-   each. With the second strategy, you can use the same name for the
-   build directory within each source tree.
-
-   If you have gotten to the compilation stage, but the distribution
-   does not build, see Section 2.9.5, "Dealing with Problems
-   Compiling MySQL," for help. If that does not solve the problem,
-   please enter it into our bugs database using the instructions
-   given in Section 1.7, "How to Report Bugs or Problems." If you
-   have installed the latest versions of the required tools, and they
-   crash trying to process our configuration files, please report
-   that also. However, if you get a command not found error or a
-   similar problem for required tools, do not report it. Instead,
-   make sure that all the required tools are installed and that your
-   PATH variable is set correctly so that your shell can find them.
+   If you have multiple source trees at the same level (for
+   example, to build multiple versions of MySQL), the second
+   strategy can be advantageous. The first strategy places all
+   build directories at the same level, which requires that you
+   choose a unique name for each. With the second strategy, you
+   can use the same name for the build directory within each
+   source tree.
+
+   If you have gotten to the compilation stage, but the
+   distribution does not build, see Section 2.9.5, "Dealing with
+   Problems Compiling MySQL," for help. If that does not solve
+   the problem, please enter it into our bugs database using the
+   instructions given in Section 1.7, "How to Report Bugs or
+   Problems." If you have installed the latest versions of the
+   required tools, and they crash trying to process our
+   configuration files, please report that also. However, if you
+   get a command not found error or a similar problem for
+   required tools, do not report it. Instead, make sure that all
+   the required tools are installed and that your PATH variable
+   is set correctly so that your shell can find them.
 
 Install the Distribution
 
@@ -5533,195 +6205,339 @@ Install the Distribution
 shell> make install
 
    This installs the files under the configured installation
-   directory (by default, /usr/local/mysql). You might need to run
-   the command as root.
+   directory (by default, /usr/local/mysql). You might need to
+   run the command as root.
 
-   To install in a specific directory, add a DESTDIR parameter to the
-   command line:
+   To install in a specific directory, add a DESTDIR parameter
+   to the command line:
 shell> make install DESTDIR="/opt/mysql"
 
-   Alternatively, generate installation package files that you can
-   install where you like:
+   Alternatively, generate installation package files that you
+   can install where you like:
 shell> make package
 
    This operation produces one or more .tar.gz files that can be
-   installed like generic binary distribution packages. See Section
-   2.2, "Installing MySQL on Unix/Linux Using Generic Binaries." If
-   you run CMake with -DCPACK_MONOLITHIC_INSTALL=1, the operation
-   produces a single file. Otherwise, it produces multiple files.
+   installed like generic binary distribution packages. See
+   Section 2.2, "Installing MySQL on Unix/Linux Using Generic
+   Binaries." If you run CMake with
+   -DCPACK_MONOLITHIC_INSTALL=1, the operation produces a single
+   file. Otherwise, it produces multiple files.
 
    On Windows, generate the data directory, then create a .zip
    archive installation package:
-shell> devenv MySQL.sln /build RelWithDebInfo /project initial_databa
-se
+shell> devenv MySQL.sln /build RelWithDebInfo /project initial_databas
+e
 shell> devenv MySQL.sln /build RelWithDebInfo /project package
 
-   You can install the resulting .zip archive where you like. See
-   Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-   noinstall Zip Archive."
+   You can install the resulting .zip archive where you like.
+   See Section 2.3.7, "Installing MySQL on Microsoft Windows
+   Using a noinstall Zip Archive."
 
 Perform Postinstallation Setup
 
-   The remainder of the installation process involves setting up the
-   configuration file, creating the core databases, and starting the
-   MySQL server. For instructions, see Section 2.10,
-   "Postinstallation Setup and Testing."
+   The remainder of the installation process involves setting up
+   the configuration file, creating the core databases, and
+   starting the MySQL server. For instructions, see Section
+   2.10, "Postinstallation Setup and Testing."
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.10,
-   "Postinstallation Setup and Testing."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10, "Postinstallation Setup and Testing."
 
 2.9.3 Installing MySQL Using a Development Source Tree
 
-   This section discusses how to install MySQL from the latest
-   development source code. Development trees have not necessarily
-   received the same level of testing as standard release
-   distributions, so this installation method is usually required
-   only if you need the most recent code changes. Do not use a
-   development tree for production systems. If your goal is simply to
-   get MySQL up and running on your system, you should use a standard
-   release distribution (either a binary or source distribution). See
-   Section 2.1.3, "How to Get MySQL."
-
-   MySQL development projects are hosted on Launchpad
-   (http://launchpad.net/). MySQL projects, including MySQL Server,
-   MySQL Workbench, and others are available from the Oracle/MySQL
-   Engineering (http://launchpad.net/~mysql) page. For the
-   repositories related only to MySQL Server, see the MySQL Server
-   (http://launchpad.net/mysql-server) page.
-
-   To install MySQL from a development source tree, your system must
-   satisfy the tool requirements listed at Section 2.9, "Installing
-   MySQL from Source," including the requirements for Bazaar and
-   bison.
+   This section describes how to install MySQL from the latest
+   development source code, which is currently hosted on both
+   GitHub (https://github.com/) and Launchpad
+   (http://launchpad.net/). To obtain the MySQL Server source
+   code from one of these repository hosting services, you can
+   set up a local MySQL Git repository or a local MySQL Bazaar
+   branch.
+
+     * On GitHub (https://github.com/), MySQL Server and other
+       MySQL projects are found on the MySQL
+       (https://github.com/mysql) page. The MySQL Server project
+       is a single repository that contains branches for MySQL
+       5.5, 5.6, and 5.7.
+       MySQL officially joined GitHub in September, 2014. For
+       more information about MySQL's move to GitHub, refer to
+       the announcement on the MySQL Release Engineering blog:
+       MySQL on GitHub
+       (http://mysqlrelease.com/2014/09/mysql-on-github/)
+
+     * On Launchpad (http://launchpad.net/), MySQL projects,
+       including MySQL Server, MySQL Workbench, and others are
+       found on the Oracle/MySQL Engineering
+       (http://launchpad.net/~mysql) page. For the repositories
+       related only to MySQL Server, see the MySQL Server
+       (http://launchpad.net/mysql-server) page.
 
-   To create a local branch of the MySQL development tree on your
-   machine, use this procedure:
+Prerequisites for Installing from Development Source
 
-    1. To obtain a copy of the MySQL source code, you must create a
-       new Bazaar branch. If you do not already have a Bazaar
+   To install MySQL from a development source tree, your system
+   must satisfy the tool requirements outlined in Section 2.9,
+   "Installing MySQL from Source."
+
+Setting Up a MySQL Git Repository
+
+   To set up a MySQL Git repository on your machine, use this
+   procedure:
+
+    1. Clone the MySQL Git repository to your machine. The
+       following command clones the MySQL Git repository to a
+       directory named mysql-server. The download size is
+       approximately 437 MB. The initial download will take some
+       time to complete, depending on the speed of your
+       connection.
+~$ git clone https://github.com/mysql/mysql-server.git
+Cloning into 'mysql-server'...
+remote: Counting objects: 1035465, done.
+remote: Total 1035465 (delta 0), reused 0 (delta 0)
+Receiving objects: 100% (1035465/1035465), 437.48 MiB | 5.10 MiB/s, do
+ne.
+Resolving deltas: 100% (855607/855607), done.
+Checking connectivity... done.
+Checking out files: 100% (21902/21902), done.
+
+    2. When the clone operation completes, the contents of your
+       local MySQL Git repository appear similar to the
+       following:
+~$ cd mysql-server
+
+~/mysql-server$ ls
+BUILD            COPYING             libmysqld    regex          tests
+BUILD-CMAKE      dbug                libservices  scripts        unitt
+est
+client           Docs                man          sql            VERSI
+ON
+cmake            extra               mysql-test   sql-bench      vio
+CMakeLists.txt   include             mysys        sql-common     win
+cmd-line-utils   INSTALL-SOURCE      packaging    storage        zlib
+config.h.cmake   INSTALL-WIN-SOURCE  plugin       strings
+configure.cmake  libmysql            README       support-files
+
+    3. Use the git branch -r command to view the remote tracking
+       branches for the MySQL repository.
+~/mysql-server$ git branch -r
+  origin/5.5
+  origin/5.6
+  origin/5.7
+  origin/HEAD -> origin/5.7
+
+    4. To view the branches that are checked out in your local
+       repository, issue the git branch command. When you cloned
+       the MySQL Git repository, the MySQL 5.7 branch was
+       checked out automatically. The asterisk identifies the
+       5.7 branch as the active branch.
+~/mysql-server$ git branch
+* 5.7
+
+    5. To check out a different MySQL branch, run the git
+       checkout command, specifying the branch name. For
+       example, to checkout the MySQL 5.5 branch:
+~/mysql-server$ git checkout 5.5
+Branch 5.5 set up to track remote branch 5.5 from origin.
+Switched to a new branch '5.5'
+
+    6. Run git branch again to verify that the MySQL 5.5 branch
+       is present. MySQL 5.5, which is the last branch you
+       checked out, is marked by an asterisk indicating that it
+       is the active branch.
+~/mysql-server$ git branch
+* 5.5
+  5.7
+       The git checkout command is also used to switch branches.
+       For example, to make MySQL 5.7 the active branch again,
+       you would run git checkout 5.7.
+
+    7. To obtain changes made after your initial setup of the
+       MySQL Git repository, switch to the branch you want to
+       update and issue the git pull command:
+~/mysql-server$ git checkout 5.5
+~/mysql-server$ git pull
+
+       To examine the commit history, use the git log option:
+~/mysql-server$ git log
+
+       You can also browse commit history and source code on the
+       GitHub MySQL (https://github.com/mysql) site.
+       If you see changes or code that you have a question
+       about, send an email to the MySQL internals mailing list.
+       See Section 1.6.1, "MySQL Mailing Lists." For information
+       about contributing a patch, see Contributing to MySQL
+       Server
+       (http://mysqlserverteam.com/contributing-to-mysql-server/
+       ).
+
+    8. After you have cloned the MySQL Git repository and have
+       checked out the branch you want to build, you can build
+       MySQL Server from the source code. Instructions are
+       provided in Section 2.9.2, "Installing MySQL Using a
+       Standard Source Distribution," except that you skip the
+       part about obtaining and unpacking the distribution.
+       Be careful about installing a build from a distribution
+       source tree on a production machine. The installation
+       command may overwrite your live release installation. If
+       you already have MySQL installed and do not want to
+       overwrite it, run CMake with values for the
+       CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR
+       options different from those used by your production
+       server. For additional information about preventing
+       multiple servers from interfering with each other, see
+       Section 5.3, "Running Multiple MySQL Instances on One
+       Machine."
+       Play hard with your new installation. For example, try to
+       make new features crash. Start by running make test. See
+       Section 24.1.2, "The MySQL Test Suite."
+
+Setting Up a MySQL Bazaar Branch
+
+   To setup a MySQL Bazaar branch on your machine, use this
+   procedure:
+
+    1. To obtain a copy of the MySQL development source code
+       hosted on Launchpad (http://launchpad.net/), create a new
+       Bazaar branch. If you do not already have a Bazaar
        repository directory set up, you must initialize a new
        directory:
 shell> mkdir mysql-server
 shell> bzr init-repo --trees mysql-server
+
        This is a one-time operation.
 
-    2. Assuming that you have an initialized repository directory,
-       you can branch from the public MySQL server repositories to
-       create a local source tree. To create a branch of a specific
-       version:
+    2. Assuming that you have an initialized repository
+       directory, you can branch from the public MySQL server
+       repositories to create a local source tree. To create a
+       branch of a specific version:
 shell> cd mysql-server
 shell> bzr branch lp:mysql-server/5.5 mysql-5.5
-       This is a one-time operation per source tree. You can branch
-       the source trees for several versions of MySQL under the
-       mysql-server directory.
-
-    3. The initial download will take some time to complete,
-       depending on the speed of your connection. Please be patient.
-       Once you have downloaded the first tree, additional trees
-       should take significantly less time to download.
-
-    4. When building from the Bazaar branch, you may want to create a
-       copy of your active branch so that you can make configuration
-       and other changes without affecting the original branch
-       contents. You can achieve this by branching from the original
-       branch:
+
+       This is a one-time operation per source tree. You can
+       branch the source trees for several versions of MySQL
+       under the mysql-server directory.
+       The initial download will take some time to complete,
+       depending on the speed of your connection. Once you have
+       downloaded the first tree, additional trees should take
+       significantly less time to download.
+
+    3. When building from the Bazaar branch, you may want to
+       create a copy of your active branch so that you can make
+       configuration and other changes without affecting the
+       original branch contents. You can achieve this by
+       branching from the original branch:
 shell> bzr branch mysql-5.5 mysql-5.5-build
 
-    5. To obtain changes made after you have set up the branch
-       initially, update it using the pull option periodically. Use
-       this command in the top-level directory of the local copy:
+
+    4. To obtain changes made after you have set up the branch
+       initially, update it using the pull option periodically.
+       Use this command in the top-level directory of the local
+       copy:
 shell> bzr pull
-       To examine the changeset comments for the tree, use the log
-       option to bzr:
+
+       To examine the changeset comments for the tree, use the
+       log option to bzr:
 shell> bzr log
+
        You can also browse changesets, comments, and source code
        online at the Launchpad MySQL Server
        (http://launchpad.net/mysql-server) page.
-       If you see diffs (changes) or code that you have a question
-       about, do not hesitate to send email to the MySQL internals
-       mailing list. See Section 1.6.1, "MySQL Mailing Lists." If you
-       think you have a better idea on how to do something, send an
-       email message to the list with a patch.
-
-   After you have the local branch, you can build MySQL server from
-   the source code. For information, see Section 2.9.2, "Installing
-   MySQL Using a Standard Source Distribution," except that you skip
-   the part about obtaining and unpacking the distribution.
-
-   Be careful about installing a build from a distribution source
-   tree on a production machine. The installation command may
-   overwrite your live release installation. If you already have
-   MySQL installed and do not want to overwrite it, run CMake with
-   values for the CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and
-   MYSQL_UNIX_ADDR options different from those used by your
-   production server. For additional information about preventing
-   multiple servers from interfering with each other, see Section
-   5.3, "Running Multiple MySQL Instances on One Machine."
-
-   Play hard with your new installation. For example, try to make new
-   features crash. Start by running make test. See Section 24.1.2,
-   "The MySQL Test Suite."
+       If you see diffs (changes) or code that you have a
+       question about, do not hesitate to send email to the
+       MySQL internals mailing list. See Section 1.6.1, "MySQL
+       Mailing Lists." For information about contributing at
+       patch, see Contributing to MySQL Server
+       (http://mysqlserverteam.com/contributing-to-mysql-server/
+       ).
+
+    5. After you have the local branch, you can build MySQL
+       server from the source code. Instructions are provided in
+       Section 2.9.2, "Installing MySQL Using a Standard Source
+       Distribution," except that you skip the part about
+       obtaining and unpacking the distribution.
+       Be careful about installing a build from a distribution
+       source tree on a production machine. The installation
+       command may overwrite your live release installation. If
+       you already have MySQL installed and do not want to
+       overwrite it, run CMake with values for the
+       CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR
+       options different from those used by your production
+       server. For additional information about preventing
+       multiple servers from interfering with each other, see
+       Section 5.3, "Running Multiple MySQL Instances on One
+       Machine."
+       Play hard with your new installation. For example, try to
+       make new features crash. Start by running make test. See
+       Section 24.1.2, "The MySQL Test Suite."
 
 2.9.4 MySQL Source-Configuration Options
 
-   The CMake program provides a great deal of control over how you
-   configure a MySQL source distribution. Typically, you do this
-   using options on the CMake command line. For information about
-   options supported by CMake, run either of these commands in the
-   top-level source directory:
+   The CMake program provides a great deal of control over how
+   you configure a MySQL source distribution. Typically, you do
+   this using options on the CMake command line. For information
+   about options supported by CMake, run either of these
+   commands in the top-level source directory:
 shell> cmake . -LH
 shell> ccmake .
 
-   You can also affect CMake using certain environment variables. See
-   Section 2.12, "Environment Variables."
+   You can also affect CMake using certain environment
+   variables. See Section 2.12, "Environment Variables."
 
    The following table shows the available CMake options. In the
    Default column, PREFIX stands for the value of the
-   CMAKE_INSTALL_PREFIX option, which specifies the installation base
-   directory. This value is used as the parent location for several
-   of the installation subdirectories.
+   CMAKE_INSTALL_PREFIX option, which specifies the installation
+   base directory. This value is used as the parent location for
+   several of the installation subdirectories.
 
-   Table 2.16 MySQL Source-Configuration Option Reference (CMake)
+   Table 2.16 MySQL Source-Configuration Option Reference
+   (CMake)
    Formats Description Default Introduced Removed
-   BUILD_CONFIG Use same build options as official releases 5.5.7
-   CMAKE_BUILD_TYPE Type of build to produce RelWithDebInfo 5.5.7
+   BUILD_CONFIG Use same build options as official releases
+   5.5.7
+   CMAKE_BUILD_TYPE Type of build to produce RelWithDebInfo
+   5.5.7
    CMAKE_C_FLAGS Flags for C Compiler
    CMAKE_CXX_FLAGS Flags for C++ Compiler
-   CMAKE_INSTALL_PREFIX Installation base directory /usr/local/mysql
-   5.5.8
-   COMPILATION_COMMENT Comment about compilation environment 5.5.7
-   CPACK_MONOLITHIC_INSTALL Whether package build produces single
-   file OFF 5.5.7
+   CMAKE_INSTALL_PREFIX Installation base directory
+   /usr/local/mysql 5.5.8
+   COMPILATION_COMMENT Comment about compilation environment
+   5.5.7
+   CPACK_MONOLITHIC_INSTALL Whether package build produces
+   single file OFF 5.5.7
    DEFAULT_CHARSET The default server character set latin1 5.5.7
-   DEFAULT_COLLATION The default server collation latin1_swedish_ci
+
+   DEFAULT_COLLATION The default server collation
+   latin1_swedish_ci 5.5.7
+   ENABLE_DEBUG_SYNC Whether to enable Debug Sync support ON
    5.5.7
-   ENABLE_DEBUG_SYNC Whether to enable Debug Sync support ON 5.5.7
    ENABLE_DOWNLOADS Whether to download optional files OFF 5.5.7
+
    ENABLE_DTRACE Whether to include DTrace support 5.5.7
    ENABLE_GCOV Whether to include gcov support 5.5.14
-   ENABLED_LOCAL_INFILE Whether to enable LOCAL for LOAD DATA INFILE
-   OFF 5.5.7
-   ENABLED_PROFILING Whether to enable query profiling code ON 5.5.7
-
-   IGNORE_AIO_CHECK With -DBUILD_CONFIG=mysql_release, ignore libaio
-   check OFF 5.5.9
+   ENABLED_LOCAL_INFILE Whether to enable LOCAL for LOAD DATA
+   INFILE OFF 5.5.7
+   ENABLED_PROFILING Whether to enable query profiling code ON
+   5.5.7
+   IGNORE_AIO_CHECK With -DBUILD_CONFIG=mysql_release, ignore
+   libaio check OFF 5.5.9
    INSTALL_BINDIR User executables directory PREFIX/bin 5.5.7
    INSTALL_DOCDIR Documentation directory PREFIX/docs 5.5.7
    INSTALL_DOCREADMEDIR README file directory PREFIX 5.5.7
    INSTALL_INCLUDEDIR Header file directory PREFIX/include 5.5.7
+
    INSTALL_INFODIR Info file directory PREFIX/docs 5.5.7
-   INSTALL_LAYOUT Select predefined installation layout STANDALONE
-   5.5.7
+   INSTALL_LAYOUT Select predefined installation layout
+   STANDALONE 5.5.7
    INSTALL_LIBDIR Library file directory PREFIX/lib 5.5.7
    INSTALL_MANDIR Manual page directory PREFIX/man 5.5.7
-   INSTALL_MYSQLSHAREDIR Shared data directory PREFIX/share 5.5.7
-   INSTALL_MYSQLTESTDIR mysql-test directory PREFIX/mysql-test 5.5.7
-
+   INSTALL_MYSQLSHAREDIR Shared data directory PREFIX/share
+   5.5.7
+   INSTALL_MYSQLTESTDIR mysql-test directory PREFIX/mysql-test
+   5.5.7
    INSTALL_PLUGINDIR Plugin directory PREFIX/lib/plugin 5.5.7
    INSTALL_SBINDIR Server executable directory PREFIX/bin 5.5.7
+
    INSTALL_SCRIPTDIR Scripts directory PREFIX/scripts 5.5.7
    INSTALL_SHAREDIR aclocal/mysql.m4 installation directory
    PREFIX/share 5.5.7
@@ -5730,9 +6546,10 @@ shell> ccmake .
    PREFIX/support-files 5.5.7
    MEMCACHED_HOME Path to memcached [none] 5.5.16-ndb-7.2.2
    MYSQL_DATADIR Data directory 5.5.7
-   MYSQL_MAINTAINER_MODE Whether to enable MySQL maintainer-specific
-   development environment OFF 5.5.7
+   MYSQL_MAINTAINER_MODE Whether to enable MySQL
+   maintainer-specific development environment OFF 5.5.7
    MYSQL_PROJECT_NAME Windows/Mac OS X project name 3306 5.5.21
+
    MYSQL_TCP_PORT TCP/IP port number 3306 5.5.7
    MYSQL_UNIX_ADDR Unix socket file /tmp/mysql.sock 5.5.7
    ODBC_INCLUDES ODBC includes directory
@@ -5747,30 +6564,33 @@ shell> ccmake .
    WITH_CLASSPATH Classpath to use when building MySQL Cluster
    Connector for Java. Default is an empty string.
    WITH_DEBUG Whether to include debugging support OFF 5.5.7
-   WITH_EMBEDDED_SERVER Whether to build embedded server OFF 5.5.7
-   WITH_EMBEDDED_SHARED_LIBRARY Whether to build a shared embedded
-   server library OFF 5.5.37
-   WITH_xxx_STORAGE_ENGINE Compile storage engine xxx statically into
-   server 5.5.7
+   WITH_EMBEDDED_SERVER Whether to build embedded server OFF
+   5.5.7
+   WITH_EMBEDDED_SHARED_LIBRARY Whether to build a shared
+   embedded server library OFF 5.5.37
+   WITH_xxx_STORAGE_ENGINE Compile storage engine xxx statically
+   into server 5.5.7
    WITH_ERROR_INSERT Enable error injection in the NDB storage
    engine. Should not be used for building binaries intended for
    production. OFF
    WITH_EXTRA_CHARSETS Which extra character sets to include all
    5.5.7
    WITH_LIBEDIT Use bundled libedit library ON 5.5.7
-   WITH_LIBWRAP Whether to include libwrap (TCP wrappers) support OFF
-   5.5.7
-   WITH_NDB_BINLOG Enable binary logging by default by mysqld. ON
+   WITH_LIBWRAP Whether to include libwrap (TCP wrappers)
+   support OFF 5.5.7
+   WITH_NDB_BINLOG Enable binary logging by default by mysqld.
+   ON
    WITH_NDB_DEBUG Produce a debug build for testing or
    troubleshooting. OFF
    WITH_NDB_JAVA Enable building of Java and ClusterJ support.
    Enabled by default. Supported in MySQL Cluster only. ON
    5.5.27-ndb-7.2.9
-   WITH_NDB_PORT Default port used by a management server built with
-   this option. If this option was not used to build it, the
-   management server's default port is 1186. [none]
+   WITH_NDB_PORT Default port used by a management server built
+   with this option. If this option was not used to build it,
+   the management server's default port is 1186. [none]
    WITH_NDB_TEST Include NDB API test programs. OFF
-   WITH_NDBCLUSTER_STORAGE_ENGINE Build the NDB storage engine ON
+   WITH_NDBCLUSTER_STORAGE_ENGINE Build the NDB storage engine
+   ON
    WITH_NDBMTD Build multi-threaded data node. ON
    WITH_READLINE Use bundled readline library OFF 5.5.7
    WITH_SSL Type of SSL support no 5.5.7
@@ -5778,8 +6598,8 @@ shell> ccmake .
    WITH_VALGRIND Whether to compile in Valgrind header files OFF
    5.5.6
    WITH_ZLIB Type of zlib support system 5.5.7
-   WITHOUT_xxx_STORAGE_ENGINE Exclude storage engine xxx from build
-   5.5.7
+   WITHOUT_xxx_STORAGE_ENGINE Exclude storage engine xxx from
+   build 5.5.7
    WITHOUT_SERVER Do not build the server OFF
 
    The following sections provide more information about CMake
@@ -5800,53 +6620,56 @@ shell> ccmake .
 
    Many options configure compile-time defaults that can be
    overridden at server startup. For example, the
-   CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR options
-   that configure the default installation base directory location,
-   TCP/IP port number, and Unix socket file can be changed at server
-   startup with the --basedir, --port, and --socket options for
-   mysqld. Where applicable, configuration option descriptions
-   indicate the corresponding mysqld startup option.
+   CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR
+   options that configure the default installation base
+   directory location, TCP/IP port number, and Unix socket file
+   can be changed at server startup with the --basedir, --port,
+   and --socket options for mysqld. Where applicable,
+   configuration option descriptions indicate the corresponding
+   mysqld startup option.
 
 General Options
 
 
      * -DBUILD_CONFIG=mysql_release
-       This option configures a source distribution with the same
-       build options used by Oracle to produce binary distributions
-       for official MySQL releases.
+       This option configures a source distribution with the
+       same build options used by Oracle to produce binary
+       distributions for official MySQL releases.
 
      * -DCMAKE_BUILD_TYPE=type
        The type of build to produce:
 
           + RelWithDebInfo: Enable optimizations and generate
-            debugging information. This is the default MySQL build
-            type.
+            debugging information. This is the default MySQL
+            build type.
 
           + Debug: Disable optimizations and generate debugging
             information. This build type is also used if the
-            WITH_DEBUG option is enabled. That is, -DWITH_DEBUG=1 has
-            the same effect as -DCMAKE_BUILD_TYPE=Debug.
+            WITH_DEBUG option is enabled. That is,
+            -DWITH_DEBUG=1 has the same effect as
+            -DCMAKE_BUILD_TYPE=Debug.
 
      * -DCPACK_MONOLITHIC_INSTALL=bool
        This option affects whether the make package operation
-       produces multiple installation package files or a single file.
-       If disabled, the operation produces multiple installation
-       package files, which may be useful if you want to install only
-       a subset of a full MySQL installation. If enabled, it produces
-       a single file for installing everything.
+       produces multiple installation package files or a single
+       file. If disabled, the operation produces multiple
+       installation package files, which may be useful if you
+       want to install only a subset of a full MySQL
+       installation. If enabled, it produces a single file for
+       installing everything.
 
 Installation Layout Options
 
-   The CMAKE_INSTALL_PREFIX option indicates the base installation
-   directory. Other options with names of the form INSTALL_xxx that
-   indicate component locations are interpreted relative to the
-   prefix and their values are relative pathnames. Their values
-   should not include the prefix.
+   The CMAKE_INSTALL_PREFIX option indicates the base
+   installation directory. Other options with names of the form
+   INSTALL_xxx that indicate component locations are interpreted
+   relative to the prefix and their values are relative
+   pathnames. Their values should not include the prefix.
 
      * -DCMAKE_INSTALL_PREFIX=dir_name
        The installation base directory.
-       This value can be set at server startup with the --basedir
-       option.
+       This value can be set at server startup with the
+       --basedir option.
 
      * -DINSTALL_BINDIR=dir_name
        Where to install user programs.
@@ -5875,10 +6698,11 @@ Installation Layout Options
 
           + DEB: DEB package layout (experimental).
        You can select a predefined layout but modify individual
-       component installation locations by specifying other options.
-       For example:
+       component installation locations by specifying other
+       options. For example:
 shell> cmake . -DINSTALL_LAYOUT=SVR4 -DMYSQL_DATADIR=/var/mysql/data
 
+
      * -DINSTALL_LIBDIR=dir_name
        Where to install library files.
 
@@ -5889,14 +6713,15 @@ shell> cmake . -DINSTALL_LAYOUT=SVR4 -DM
        Where to install shared data files.
 
      * -DINSTALL_MYSQLTESTDIR=dir_name
-       Where to install the mysql-test directory. As of MySQL 5.5.32,
-       to suppress installation of this directory, explicitly set the
-       option to the empty value (-DINSTALL_MYSQLTESTDIR=).
+       Where to install the mysql-test directory. As of MySQL
+       5.5.32, to suppress installation of this directory,
+       explicitly set the option to the empty value
+       (-DINSTALL_MYSQLTESTDIR=).
 
      * -DINSTALL_PLUGINDIR=dir_name
        The location of the plugin directory.
-       This value can be set at server startup with the --plugin_dir
-       option.
+       This value can be set at server startup with the
+       --plugin_dir option.
 
      * -DINSTALL_SBINDIR=dir_name
        Where to install the mysqld server.
@@ -5909,54 +6734,55 @@ shell> cmake . -DINSTALL_LAYOUT=SVR4 -DM
 
      * -DINSTALL_SQLBENCHDIR=dir_name
        Where to install the sql-bench directory. To suppress
-       installation of this directory, explicitly set the option to
-       the empty value (-DINSTALL_SQLBENCHDIR=).
+       installation of this directory, explicitly set the option
+       to the empty value (-DINSTALL_SQLBENCHDIR=).
 
      * -DINSTALL_SUPPORTFILESDIR=dir_name
        Where to install extra support files.
 
      * -DMYSQL_DATADIR=dir_name
        The location of the MySQL data directory.
-       This value can be set at server startup with the --datadir
-       option.
+       This value can be set at server startup with the
+       --datadir option.
 
      * -DODBC_INCLUDES=dir_name
-       The location of the ODBC includes directory, and may be used
-       while configuring Connector/ODBC.
+       The location of the ODBC includes directory, and may be
+       used while configuring Connector/ODBC.
 
      * -DODBC_LIB_DIR=dir_name
-       The location of the ODBC library directory, and may be used
-       while configuring Connector/ODBC.
+       The location of the ODBC library directory, and may be
+       used while configuring Connector/ODBC.
 
      * -DSYSCONFDIR=dir_name
        The default my.cnf option file directory.
-       This location cannot be set at server startup, but you can
-       start the server with a given option file using the
-       --defaults-file=file_name option, where file_name is the full
-       path name to the file.
+       This location cannot be set at server startup, but you
+       can start the server with a given option file using the
+       --defaults-file=file_name option, where file_name is the
+       full path name to the file.
 
      * -DTMPDIR=dir_name
-       The default location to use for the tmpdir system variable. If
-       unspecified, the value defaults to P_tmpdir in <stdio.h>. This
-       option was added in MySQL 5.6.16.
+       The default location to use for the tmpdir system
+       variable. If unspecified, the value defaults to P_tmpdir
+       in <stdio.h>. This option was added in MySQL 5.6.16.
 
 Storage Engine Options
 
-   Storage engines are built as plugins. You can build a plugin as a
-   static module (compiled into the server) or a dynamic module
-   (built as a dynamic library that must be installed into the server
-   using the INSTALL PLUGIN statement or the --plugin-load option
-   before it can be used). Some plugins might not support static or
-   dynamic building.
-
-   The MyISAM, MERGE, MEMORY, and CSV engines are mandatory (always
-   compiled into the server) and need not be installed explicitly.
+   Storage engines are built as plugins. You can build a plugin
+   as a static module (compiled into the server) or a dynamic
+   module (built as a dynamic library that must be installed
+   into the server using the INSTALL PLUGIN statement or the
+   --plugin-load option before it can be used). Some plugins
+   might not support static or dynamic building.
+
+   The MyISAM, MERGE, MEMORY, and CSV engines are mandatory
+   (always compiled into the server) and need not be installed
+   explicitly.
 
    To compile a storage engine statically into the server, use
-   -DWITH_engine_STORAGE_ENGINE=1. Some permissible engine values are
-   ARCHIVE, BLACKHOLE, EXAMPLE, FEDERATED, INNOBASE (InnoDB),
-   NDBCLUSTER (NDB), PARTITION (partitioning support), and PERFSCHEMA
-   (Performance Schema). Examples:
+   -DWITH_engine_STORAGE_ENGINE=1. Some permissible engine
+   values are ARCHIVE, BLACKHOLE, EXAMPLE, FEDERATED, INNOBASE
+   (InnoDB), NDBCLUSTER (NDB), PARTITION (partitioning support),
+   and PERFSCHEMA (Performance Schema). Examples:
 -DWITH_INNOBASE_STORAGE_ENGINE=1
 -DWITH_ARCHIVE_STORAGE_ENGINE=1
 -DWITH_BLACKHOLE_STORAGE_ENGINE=1
@@ -5964,14 +6790,14 @@ Storage Engine Options
 
    Note
 
-   WITH_NDBCLUSTER_STORAGE_ENGINE is supported only when building
-   MySQL Cluster using the MySQL Cluster sources. It cannot be used
-   to enable clustering support in other MySQL source trees or
-   distributions. In MySQL Cluster NDB 7.2 source distributions, it
-   is enabled by default. See Section 18.2.1.3, "Building MySQL
-   Cluster from Source on Linux," and Section 18.2.2.2, "Compiling
-   and Installing MySQL Cluster from Source on Windows," for more
-   information.
+   WITH_NDBCLUSTER_STORAGE_ENGINE is supported only when
+   building MySQL Cluster using the MySQL Cluster sources. It
+   cannot be used to enable clustering support in other MySQL
+   source trees or distributions. In MySQL Cluster NDB 7.2
+   source distributions, it is enabled by default. See Section
+   18.2.1.3, "Building MySQL Cluster from Source on Linux," and
+   Section 18.2.2.2, "Compiling and Installing MySQL Cluster
+   from Source on Windows," for more information.
 
    To exclude a storage engine from the build, use
    -DWITHOUT_engine_STORAGE_ENGINE=1. Examples:
@@ -5980,9 +6806,9 @@ Storage Engine Options
 -DWITHOUT_PARTITION_STORAGE_ENGINE=1
 
    If neither -DWITH_engine_STORAGE_ENGINE nor
-   -DWITHOUT_engine_STORAGE_ENGINE are specified for a given storage
-   engine, the engine is built as a shared module, or excluded if it
-   cannot be built as a shared module.
+   -DWITHOUT_engine_STORAGE_ENGINE are specified for a given
+   storage engine, the engine is built as a shared module, or
+   excluded if it cannot be built as a shared module.
 
 Feature Options
 
@@ -5991,15 +6817,16 @@ Feature Options
        A descriptive comment about the compilation environment.
 
      * -DDEFAULT_CHARSET=charset_name
-       The server character set. By default, MySQL uses the latin1
-       (cp1252 West European) character set.
+       The server character set. By default, MySQL uses the
+       latin1 (cp1252 West European) character set.
        charset_name may be one of binary, armscii8, ascii, big5,
-       cp1250, cp1251, cp1256, cp1257, cp850, cp852, cp866, cp932,
-       dec8, eucjpms, euckr, gb2312, gbk, geostd8, greek, hebrew,
-       hp8, keybcs2, koi8r, koi8u, latin1, latin2, latin5, latin7,
-       macce, macroman, sjis, swe7, tis620, ucs2, ujis, utf8,
-       utf8mb4, utf16, utf32. The permissible character sets are
-       listed in the cmake/character_sets.cmake file as the value of
+       cp1250, cp1251, cp1256, cp1257, cp850, cp852, cp866,
+       cp932, dec8, eucjpms, euckr, gb2312, gbk, geostd8, greek,
+       hebrew, hp8, keybcs2, koi8r, koi8u, latin1, latin2,
+       latin5, latin7, macce, macroman, sjis, swe7, tis620,
+       ucs2, ujis, utf8, utf8mb4, utf16, utf32. The permissible
+       character sets are listed in the
+       cmake/character_sets.cmake file as the value of
        CHARSETS_AVAILABLE.
        This value can be set at server startup with the
        --character_set_server option.
@@ -6007,68 +6834,73 @@ Feature Options
      * -DDEFAULT_COLLATION=collation_name
        The server collation. By default, MySQL uses
        latin1_swedish_ci. Use the SHOW COLLATION statement to
-       determine which collations are available for each character
-       set.
+       determine which collations are available for each
+       character set.
        This value can be set at server startup with the
        --collation_server option.
 
      * -DENABLE_DEBUG_SYNC=bool
-       Whether to compile the Debug Sync facility into the server.
-       This facility is used for testing and debugging. This option
-       is enabled by default, but has no effect unless MySQL is
-       configured with debugging enabled. If debugging is enabled and
-       you want to disable Debug Sync, use -DENABLE_DEBUG_SYNC=0.
+       Whether to compile the Debug Sync facility into the
+       server. This facility is used for testing and debugging.
+       This option is enabled by default, but has no effect
+       unless MySQL is configured with debugging enabled. If
+       debugging is enabled and you want to disable Debug Sync,
+       use -DENABLE_DEBUG_SYNC=0.
        When compiled in, Debug Sync is disabled by default at
        runtime. To enable it, start mysqld with the
        --debug-sync-timeout=N option, where N is a timeout value
-       greater than 0. (The default value is 0, which disables Debug
-       Sync.) N becomes the default timeout for individual
+       greater than 0. (The default value is 0, which disables
+       Debug Sync.) N becomes the default timeout for individual
        synchronization points.
-       For a description of the Debug Sync facility and how to use
-       synchronization points, see MySQL Internals: Test
+       For a description of the Debug Sync facility and how to
+       use synchronization points, see MySQL Internals: Test
        Synchronization
-       (http://dev.mysql.com/doc/internals/en/test-synchronization.ht
-       ml).
+       (http://dev.mysql.com/doc/internals/en/test-synchronizati
+       on.html).
 
      * -DENABLE_DOWNLOADS=bool
-       Whether to download optional files. For example, with this
-       option enabled, CMake downloads the Google Test distribution
-       that is used by the test suite to run unit tests.
+       Whether to download optional files. For example, with
+       this option enabled, CMake downloads the Google Test
+       distribution that is used by the test suite to run unit
+       tests.
 
      * -DENABLE_DTRACE=bool
-       Whether to include support for DTrace probes. For information
-       about DTrace, wee Section 5.4, "Tracing mysqld Using DTrace"
+       Whether to include support for DTrace probes. For
+       information about DTrace, wee Section 5.4, "Tracing
+       mysqld Using DTrace"
 
      * -DENABLE_GCOV=bool
        Whether to include gcov support (Linux only).
 
      * -DENABLED_LOCAL_INFILE=bool
-       Whether to enable LOCAL capability in the client library for
-       LOAD DATA INFILE.
-       This option controls client-side LOCAL capability, but the
-       capability can be set on the server side at server startup
-       with the --local-infile option. See Section 6.1.6, "Security
-       Issues with LOAD DATA LOCAL."
+       Whether to enable LOCAL capability in the client library
+       for LOAD DATA INFILE.
+       This option controls client-side LOCAL capability, but
+       the capability can be set on the server side at server
+       startup with the --local-infile option. See Section
+       6.1.6, "Security Issues with LOAD DATA LOCAL."
 
      * -DENABLED_PROFILING=bool
-       Whether to enable query profiling code (for the SHOW PROFILE
-       and SHOW PROFILES statements).
+       Whether to enable query profiling code (for the SHOW
+       PROFILE and SHOW PROFILES statements).
 
      * -DIGNORE_AIO_CHECK=bool
-       If the -DBUILD_CONFIG=mysql_release option is given on Linux,
-       the libaio library must be linked in by default. If you do not
-       have libaio or do not want to install it, you can suppress the
-       check for it by specifying -DIGNORE_AIO_CHECK=1. This option
-       was added in MySQL 5.5.9.
+       If the -DBUILD_CONFIG=mysql_release option is given on
+       Linux, the libaio library must be linked in by default.
+       If you do not have libaio or do not want to install it,
+       you can suppress the check for it by specifying
+       -DIGNORE_AIO_CHECK=1. This option was added in MySQL
+       5.5.9.
 
      * -DMYSQL_MAINTAINER_MODE=bool
        Whether to enable a MySQL maintainer-specific development
-       environment. If enabled, this option causes compiler warnings
-       to become errors.
+       environment. If enabled, this option causes compiler
+       warnings to become errors.
 
      * -DMYSQL_PROJECT_NAME=name
-       For Windows or Mac OS X, the project name to incorporate into
-       the project file name. This option was added in MySQL 5.5.21.
+       For Windows or Mac OS X, the project name to incorporate
+       into the project file name. This option was added in
+       MySQL 5.5.21.
 
      * -DMYSQL_TCP_PORT=port_num
        The port number on which the server listens for TCP/IP
@@ -6078,30 +6910,31 @@ Feature Options
 
      * -DMYSQL_UNIX_ADDR=file_name
        The Unix socket file path on which the server listens for
-       socket connections. This must be an absolute path name. The
-       default is /tmp/mysql.sock.
+       socket connections. This must be an absolute path name.
+       The default is /tmp/mysql.sock.
        This value can be set at server startup with the --socket
        option.
 
      * -DWITH_ASAN=bool
-       Whether to enable AddressSanitizer, for compilers that support
-       it. The default is off. This option was added in MySQL 5.5.35.
+       Whether to enable AddressSanitizer, for compilers that
+       support it. The default is off. This option was added in
+       MySQL 5.5.35.
 
      * -DWITH_DEBUG=bool
        Whether to include debugging support.
-       Configuring MySQL with debugging support enables you to use
-       the --debug="d,parser_debug" option when you start the server.
-       This causes the Bison parser that is used to process SQL
-       statements to dump a parser trace to the server's standard
-       error output. Typically, this output is written to the error
-       log.
+       Configuring MySQL with debugging support enables you to
+       use the --debug="d,parser_debug" option when you start
+       the server. This causes the Bison parser that is used to
+       process SQL statements to dump a parser trace to the
+       server's standard error output. Typically, this output is
+       written to the error log.
 
      * -DWITH_EMBEDDED_SERVER=bool
        Whether to build the libmysqld embedded server library.
 
      * -DWITH_EMBEDDED_SHARED_LIBRARY=bool
-       Whether to build a shared libmysqld embedded server library.
-       This option was added in MySQL 5.5.37.
+       Whether to build a shared libmysqld embedded server
+       library. This option was added in MySQL 5.5.37.
 
      * -DWITH_EXTRA_CHARSETS=name
        Which extra character sets to include:
@@ -6135,35 +6968,38 @@ Feature Options
             distribution.
 
           + system: Use the system SSL library.
-       For information about using SSL support, see Section 6.3.9,
-       "Using SSL for Secure Connections."
+       For information about using SSL support, see Section
+       6.3.9, "Using SSL for Secure Connections."
 
      * -DWITH_UNIXODBC=1
        Enables unixODBC support, for Connector/ODBC.
 
      * -DWITH_VALGRIND=bool
-       Whether to compile in the Valgrind header files, which exposes
-       the Valgrind API to MySQL code. The default is OFF.
-       To generate a Valgrind-aware debug build, -DWITH_VALGRIND=1
-       normally is combined with -DWITH_DEBUG=1. See Building Debug
-       Configurations
-       (http://dev.mysql.com/doc/internals/en/debug-configurations.ht
-       ml).
+       Whether to compile in the Valgrind header files, which
+       exposes the Valgrind API to MySQL code. The default is
+       OFF.
+       To generate a Valgrind-aware debug build,
+       -DWITH_VALGRIND=1 normally is combined with
+       -DWITH_DEBUG=1. See Building Debug Configurations
+       (http://dev.mysql.com/doc/internals/en/debug-configuratio
+       ns.html).
 
      * -DWITH_ZLIB=zlib_type
        Some features require that the server be built with
        compression library support, such as the COMPRESS() and
-       UNCOMPRESS() functions, and compression of the client/server
-       protocol. The WITH_ZLIB indicates the source of zlib support:
+       UNCOMPRESS() functions, and compression of the
+       client/server protocol. The WITH_ZLIB indicates the
+       source of zlib support:
 
           + bundled: Use the zlib library bundled with the
             distribution.
 
-          + system: Use the system zlib library. This is the default.
+          + system: Use the system zlib library. This is the
+            default.
 
      * -DWITHOUT_SERVER=bool
-       Whether to build without the MySQL server. The default is OFF,
-       which does build the server.
+       Whether to build without the MySQL server. The default is
+       OFF, which does build the server.
 
 Compiler Flags
 
@@ -6174,85 +7010,88 @@ Compiler Flags
      * -DCMAKE_CXX_FLAGS="flags"
        Flags for the C++ Compiler.
 
-   To specify your own C and C++ compiler flags, for flags that do
-   not affect optimization, use the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS
-   CMake options.
+   To specify your own C and C++ compiler flags, for flags that
+   do not affect optimization, use the CMAKE_C_FLAGS and
+   CMAKE_CXX_FLAGS CMake options.
 
-   When providing your own compiler flags, you might want to specify
-   CMAKE_BUILD_TYPE as well.
+   When providing your own compiler flags, you might want to
+   specify CMAKE_BUILD_TYPE as well.
 
-   For example, to create a 32-bit release build on a 64-bit Linux
-   machine, do this:
+   For example, to create a 32-bit release build on a 64-bit
+   Linux machine, do this:
 shell> mkdir bld
 shell> cd bld
 shell> cmake .. -DCMAKE_C_FLAGS=-m32 \
          -DCMAKE_CXX_FLAGS=-m32 \
          -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
-   If you set flags that affect optimization (-Onumber), you must set
-   the CMAKE_C_FLAGS_build_type and/or CMAKE_CXX_FLAGS_build_type
-   options, where build_type corresponds to the CMAKE_BUILD_TYPE
-   value. To specify a different optimization for the default build
-   type (RelWithDebInfo) set the CMAKE_C_FLAGS_RELWITHDEBINFO and
-   CMAKE_CXX_FLAGS_RELWITHDEBINFO options. For example, to compile on
-   Linux with -O3 and with debug symbols, do this:
+   If you set flags that affect optimization (-Onumber), you
+   must set the CMAKE_C_FLAGS_build_type and/or
+   CMAKE_CXX_FLAGS_build_type options, where build_type
+   corresponds to the CMAKE_BUILD_TYPE value. To specify a
+   different optimization for the default build type
+   (RelWithDebInfo) set the CMAKE_C_FLAGS_RELWITHDEBINFO and
+   CMAKE_CXX_FLAGS_RELWITHDEBINFO options. For example, to
+   compile on Linux with -O3 and with debug symbols, do this:
 shell> cmake .. -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O3 -g" \
          -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O3 -g"
 
 CMake Options for Compiling MySQL Cluster
 
-   The following options are for use when building MySQL Cluster NDB
-   7.2 or later. These options are supported only with the MySQL
-   Cluster NDB 7.2 and later MySQL Cluster sources; they are not
-   supported when using sources from the MySQL 5.5 Server tree.
+   The following options are for use when building MySQL Cluster
+   NDB 7.2 or later. These options are supported only with the
+   MySQL Cluster NDB 7.2 and later MySQL Cluster sources; they
+   are not supported when using sources from the MySQL 5.5
+   Server tree.
 
      * -DMEMCACHED_HOME=path
-       Perform the build using the memcached (version 1.6 or later)
-       installed in the system directory indicated by path. Files
-       from this installation that are used in the build include the
-       memcached binary, header files, and libraries, as well as the
-       memcached_utilities library and the header file
-       engine_testapp.h.
-       You must leave this option unset when building ndbmemcache
-       using the bundled memcached sources (WITH_BUNDLED_MEMCACHED
-       option); in other words, the bundled sources are used by
-       default).
+       Perform the build using the memcached (version 1.6 or
+       later) installed in the system directory indicated by
+       path. Files from this installation that are used in the
+       build include the memcached binary, header files, and
+       libraries, as well as the memcached_utilities library and
+       the header file engine_testapp.h.
+       You must leave this option unset when building
+       ndbmemcache using the bundled memcached sources
+       (WITH_BUNDLED_MEMCACHED option); in other words, the
+       bundled sources are used by default).
        This option was added in MySQL Cluster NDB 7.2.2.
        While additional CMake options---such as for SASL
-       authorization and for providing dtrace support---are available
-       for use when compiling memcached from external sources, these
-       options are currently not enabled for the memcached sources
-       bundled with MySQL Cluster.
+       authorization and for providing dtrace support---are
+       available for use when compiling memcached from external
+       sources, these options are currently not enabled for the
+       memcached sources bundled with MySQL Cluster.
 
      * -DWITH_BUNDLED_LIBEVENT={ON|OFF}
-       Use the libevent included in the MySQL Cluster sources when
-       building MySQL Cluster with ndbmemcached support (MySQL
-       Cluster NDB 7.2.2 and later). Enabled by default. OFF causes
-       the system's libevent to be used instead.
+       Use the libevent included in the MySQL Cluster sources
+       when building MySQL Cluster with ndbmemcached support
+       (MySQL Cluster NDB 7.2.2 and later). Enabled by default.
+       OFF causes the system's libevent to be used instead.
 
      * -DWITH_BUNDLED_MEMCACHED={ON|OFF}
        Build the memcached sources included in the MySQL Cluster
-       source tree (MySQL Cluster NDB 7.2.3 and later), then use the
-       resulting memcached server when building the ndbmemcache
-       engine. In this case, make install places the memcached binary
-       in the installation bin directory, and the ndbmemcache engine
-       shared object file ndb_engine.so in the installation lib
-       directory.
+       source tree (MySQL Cluster NDB 7.2.3 and later), then use
+       the resulting memcached server when building the
+       ndbmemcache engine. In this case, make install places the
+       memcached binary in the installation bin directory, and
+       the ndbmemcache engine shared object file ndb_engine.so
+       in the installation lib directory.
        This option is ON by default.
 
      * -DWITH_CLASSPATH=path
-       Sets the classpath for building MySQL Cluster Connector for
-       Java. The default is empty. In MySQL Cluster NDB 7.2.9 and
-       later, this option is ignored if -DWITH_NDB_JAVA=OFF is used.
+       Sets the classpath for building MySQL Cluster Connector
+       for Java. The default is empty. In MySQL Cluster NDB
+       7.2.9 and later, this option is ignored if
+       -DWITH_NDB_JAVA=OFF is used.
 
      * -DWITH_ERROR_INSERT={ON|OFF}
-       Enables error injection in the NDB kernel. For testing only;
-       not intended for use in building production binaries. The
-       default is OFF.
+       Enables error injection in the NDB kernel. For testing
+       only; not intended for use in building production
+       binaries. The default is OFF.
 
      * -DWITH_NDBCLUSTER_STORAGE_ENGINE={ON|OFF}
-       Build and link in support for the NDB (NDBCLUSTER) storage
-       engine in mysqld. The default is ON.
+       Build and link in support for the NDB (NDBCLUSTER)
+       storage engine in mysqld. The default is ON.
 
      * -DWITH_NDBCLUSTER={ON|OFF}
        This is an alias for WITH_NDBCLUSTER_STORAGE_ENGINE.
@@ -6262,27 +7101,28 @@ CMake Options for Compiling MySQL Cluste
        default is ON.
 
      * -DWITH_NDB_BINLOG={ON|OFF}
-       Enable binary logging by default in the mysqld built using
-       this option. ON by default.
+       Enable binary logging by default in the mysqld built
+       using this option. ON by default.
 
      * -DWITH_NDB_DEBUG={ON|OFF}
        Enable building the debug versions of the MySQL Cluster
        binaries. OFF by default.
 
      * -DWITH_NDB_JAVA={ON|OFF}
-       Enable building MySQL Cluster with Java support, including
-       ClusterJ.
-       This option was added in MySQL Cluster NDB 7.2.9, and is ON by
-       default. If you do not wish to compile MySQL Cluster with Java
-       support, you must disable it explicitly by specifying
-       -DWITH_NDB_JAVA=OFF when running CMake. Otherwise, if Java
-       cannot be found, configuration of the build fails.
+       Enable building MySQL Cluster with Java support,
+       including ClusterJ.
+       This option was added in MySQL Cluster NDB 7.2.9, and is
+       ON by default. If you do not wish to compile MySQL
+       Cluster with Java support, you must disable it explicitly
+       by specifying -DWITH_NDB_JAVA=OFF when running CMake.
+       Otherwise, if Java cannot be found, configuration of the
+       build fails.
 
      * -DWITH_NDB_PORT=port
-       Causes the MySQL Cluster management server (ndb_mgmd) that is
-       built to use this port by default. If this option is unset,
-       the resulting management server tries to use port 1186 by
-       default.
+       Causes the MySQL Cluster management server (ndb_mgmd)
+       that is built to use this port by default. If this option
+       is unset, the resulting management server tries to use
+       port 1186 by default.
 
      * -DWITH_NDB_TEST={ON|OFF}
        If enabled, include a set of NDB API test programs. The
@@ -6290,23 +7130,25 @@ CMake Options for Compiling MySQL Cluste
 
 2.9.5 Dealing with Problems Compiling MySQL
 
-   The solution to many problems involves reconfiguring. If you do
-   reconfigure, take note of the following:
+   The solution to many problems involves reconfiguring. If you
+   do reconfigure, take note of the following:
 
-     * If CMake is run after it has previously been run, it may use
-       information that was gathered during its previous invocation.
-       This information is stored in CMakeCache.txt. When CMake
-       starts up, it looks for that file and reads its contents if it
-       exists, on the assumption that the information is still
-       correct. That assumption is invalid when you reconfigure.
-
-     * Each time you run CMake, you must run make again to recompile.
-       However, you may want to remove old object files from previous
-       builds first because they were compiled using different
-       configuration options.
+     * If CMake is run after it has previously been run, it may
+       use information that was gathered during its previous
+       invocation. This information is stored in CMakeCache.txt.
+       When CMake starts up, it looks for that file and reads
+       its contents if it exists, on the assumption that the
+       information is still correct. That assumption is invalid
+       when you reconfigure.
+
+     * Each time you run CMake, you must run make again to
+       recompile. However, you may want to remove old object
+       files from previous builds first because they were
+       compiled using different configuration options.
 
    To prevent old object files or configuration information from
-   being used, run the following commands before re-running CMake:
+   being used, run the following commands before re-running
+   CMake:
 
    On Unix:
 shell> make clean
@@ -6316,316 +7158,349 @@ shell> rm CMakeCache.txt
 shell> devenv MySQL.sln /clean
 shell> del CMakeCache.txt
 
-   If you build outside of the source tree, remove and recreate your
-   build directory before re-running CMake. For instructions on
-   building outside of the source tree, see How to Build MySQL Server
-   with CMake (http://dev.mysql.com/doc/internals/en/cmake.html).
-
-   On some systems, warnings may occur due to differences in system
-   include files. The following list describes other problems that
-   have been found to occur most often when compiling MySQL:
+   If you build outside of the source tree, remove and recreate
+   your build directory before re-running CMake. For
+   instructions on building outside of the source tree, see How
+   to Build MySQL Server with CMake
+   (http://dev.mysql.com/doc/internals/en/cmake.html).
+
+   On some systems, warnings may occur due to differences in
+   system include files. The following list describes other
+   problems that have been found to occur most often when
+   compiling MySQL:
 
-     * To define which C and C++ compilers to use, you can define the
-       CC and CXX environment variables. For example:
+     * To define which C and C++ compilers to use, you can
+       define the CC and CXX environment variables. For example:
 shell> CC=gcc
 shell> CXX=g++
 shell> export CC CXX
+
        To specify your own C and C++ compiler flags, use the
-       CMAKE_C_FLAGS and CMAKE_CXX_FLAGS CMake options. See Section
-       2.9.4, "."
+       CMAKE_C_FLAGS and CMAKE_CXX_FLAGS CMake options. See
+       Section 2.9.4, "."
        To see what flags you might need to specify, invoke
        mysql_config with the --cflags option.
 
-     * To see what commands are executed during the compile stage,
-       after using CMake to configure MySQL, run make VERBOSE=1
-       rather than just make.
-
-     * If compilation fails, check whether the MYSQL_MAINTAINER_MODE
-       option is enabled. This mode causes compiler warnings to
-       become errors, so disabling it may enable compilation to
-       proceed.
+     * To see what commands are executed during the compile
+       stage, after using CMake to configure MySQL, run make
+       VERBOSE=1 rather than just make.
+
+     * If compilation fails, check whether the
+       MYSQL_MAINTAINER_MODE option is enabled. This mode causes
+       compiler warnings to become errors, so disabling it may
+       enable compilation to proceed.
 
      * If your compile fails with errors such as any of the
-       following, you must upgrade your version of make to GNU make:
+       following, you must upgrade your version of make to GNU
+       make:
 make: Fatal error in reader: Makefile, line 18:
 Badly formed macro assignment
+
        Or:
 make: file `Makefile' line 18: Must be a separator (:
+
        Or:
 pthread.h: No such file or directory
+
        Solaris and FreeBSD are known to have troublesome make
        programs.
        GNU make 3.75 is known to work.
 
-     * The sql_yacc.cc file is generated from sql_yacc.yy. Normally,
-       the build process does not need to create sql_yacc.cc because
-       MySQL comes with a pregenerated copy. However, if you do need
-       to re-create it, you might encounter this error:
+     * The sql_yacc.cc file is generated from sql_yacc.yy.
+       Normally, the build process does not need to create
+       sql_yacc.cc because MySQL comes with a pregenerated copy.
+       However, if you do need to re-create it, you might
+       encounter this error:
 "sql_yacc.yy", line xxx fatal: default action causes potential...
-       This is a sign that your version of yacc is deficient. You
-       probably need to install a recent version of bison (the GNU
-       version of yacc) and use that instead.
+
+       This is a sign that your version of yacc is deficient.
+       You probably need to install a recent version of bison
+       (the GNU version of yacc) and use that instead.
        Versions of bison older than 1.75 may report this error:
 sql_yacc.yy:#####: fatal error: maximum table size (32767) exceeded
-       The maximum table size is not actually exceeded; the error is
-       caused by bugs in older versions of bison.
 
-   For information about acquiring or updating tools, see the system
-   requirements in Section 2.9, "Installing MySQL from Source."
+       The maximum table size is not actually exceeded; the
+       error is caused by bugs in older versions of bison.
+
+   For information about acquiring or updating tools, see the
+   system requirements in Section 2.9, "Installing MySQL from
+   Source."
 
 2.9.6 MySQL Configuration and Third-Party Tools
 
-   Third-party tools that need to determine the MySQL version from
-   the MySQL source can read the VERSION file in the top-level source
-   directory. The file lists the pieces of the version separately.
-   For example, if the version is MySQL 5.7.4-m14, the file looks
-   like this:
+   Third-party tools that need to determine the MySQL version
+   from the MySQL source can read the VERSION file in the
+   top-level source directory. The file lists the pieces of the
+   version separately. For example, if the version is MySQL
+   5.7.4-m14, the file looks like this:
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
 MYSQL_VERSION_PATCH=4
 MYSQL_VERSION_EXTRA=-m14
 
-   If the source is not for a General Availablility (GA) release, the
-   MYSQL_VERSION_EXTRA value will be nonempty. For the example, the
-   value corresponds to Milestone 14.
-
-   To construct a five-digit number from the version components, use
-   this formula:
-MYSQL_VERSION_MAJOR*10000 + MYSQL_VERSION_MINOR*100 + MYSQL_VERSION_P
-ATCH
+   If the source is not for a General Availablility (GA)
+   release, the MYSQL_VERSION_EXTRA value will be nonempty. For
+   the example, the value corresponds to Milestone 14.
+
+   To construct a five-digit number from the version components,
+   use this formula:
+MYSQL_VERSION_MAJOR*10000 + MYSQL_VERSION_MINOR*100 + MYSQL_VERSION_PA
+TCH
 
 2.10 Postinstallation Setup and Testing
 
    This section discusses post-installation items for Unix-like
-   systems. If you are using Windows, see Section 2.3.10, "Windows
-   Postinstallation Procedures."
+   systems. If you are using Windows, see Section 2.3.10,
+   "Windows Postinstallation Procedures."
 
    After installing MySQL, there are some items that you should
    address. For example:
 
-     * You should initialize the data directory and create the MySQL
-       grant tables, as describe in Section 2.10.1, "Postinstallation
-       Procedures for Unix-like Systems."
-
-     * An important security concern is that the initial accounts in
-       the grant tables have no passwords. You should assign
-       passwords to prevent unauthorized access to the MySQL server.
-       For instructions, see Section 2.10.2, "Securing the Initial
-       MySQL Accounts."
+     * You should initialize the data directory and create the
+       MySQL grant tables, as describe in Section 2.10.1,
+       "Postinstallation Procedures for Unix-like Systems."
+
+     * An important security concern is that the initial
+       accounts in the grant tables have no passwords. You
+       should assign passwords to prevent unauthorized access to
+       the MySQL server. For instructions, see Section 2.10.2,
+       "Securing the Initial MySQL Accounts."
 
      * Optionally, you can create time zone tables to enable
-       recognition of named time zones. For instructions, see Section
-       4.4.6, "mysql_tzinfo_to_sql --- Load the Time Zone Tables."
-
-     * If you have trouble getting the server to start, see Section
-       2.10.1.3, "Starting and Troubleshooting the MySQL Server."
-
-     * When you are ready to create additional user accounts, you can
-       find information on the MySQL access control system and
-       account management in Section 6.2, "The MySQL Access Privilege
-       System," and Section 6.3, "MySQL User Account Management."
+       recognition of named time zones. For instructions, see
+       Section 4.4.6, "mysql_tzinfo_to_sql --- Load the Time
+       Zone Tables."
+
+     * If you have trouble getting the server to start, see
+       Section 2.10.1.3, "Starting and Troubleshooting the MySQL
+       Server."
+
+     * When you are ready to create additional user accounts,
+       you can find information on the MySQL access control
+       system and account management in Section 6.2, "The MySQL
+       Access Privilege System," and Section 6.3, "MySQL User
+       Account Management."
 
 2.10.1 Postinstallation Procedures for Unix-like Systems
 
-   After installing MySQL on a Unix-like system, you must initialize
-   the grant tables, start the server, and make sure that the server
-   works satisfactorily. You may also wish to arrange for the server
-   to be started and stopped automatically when your system starts
-   and stops. You should also assign passwords to the accounts in the
-   grant tables.
+   After installing MySQL on a Unix-like system, you must
+   initialize the grant tables, start the server, and make sure
+   that the server works satisfactorily. You may also wish to
+   arrange for the server to be started and stopped
+   automatically when your system starts and stops. You should
+   also assign passwords to the accounts in the grant tables.
 
    On a Unix-like system, the grant tables are set up by the
    mysql_install_db program. For some installation methods, this
    program is run for you automatically if an existing database
    cannot be found.
 
-     * If you install MySQL on Linux using RPM distributions, the
-       server RPM runs mysql_install_db.
+     * If you install MySQL on Linux using RPM distributions,
+       the server RPM runs mysql_install_db.
 
-     * Using the native packaging system on many platforms, including
-       Debian Linux, Ubuntu Linux, Gentoo Linux and others, the
-       mysql_install_db command is run for you.
+     * Using the native packaging system on many platforms,
+       including Debian Linux, Ubuntu Linux, Gentoo Linux and
+       others, the mysql_install_db command is run for you.
 
-     * If you install MySQL on Mac OS X using a DMG distribution, the
-       installer runs mysql_install_db.
+     * If you install MySQL on Mac OS X using a DMG
+       distribution, the installer runs mysql_install_db.
 
    For other platforms and installation types, including generic
-   binary and source installs, you will need to run mysql_install_db
-   yourself.
+   binary and source installs, you will need to run
+   mysql_install_db yourself.
 
    The following procedure describes how to initialize the grant
    tables (if that has not previously been done) and start the
-   server. It also suggests some commands that you can use to test
-   whether the server is accessible and working properly. For
-   information about starting and stopping the server automatically,
-   see Section 2.10.1.2, "Starting and Stopping MySQL Automatically."
-
-   After you complete the procedure and have the server running, you
-   should assign passwords to the accounts created by
-   mysql_install_db and perhaps restrict access to test databases.
-   For instructions, see Section 2.10.2, "Securing the Initial MySQL
-   Accounts."
-
-   In the examples shown here, the server runs under the user ID of
-   the mysql login account. This assumes that such an account exists.
-   Either create the account if it does not exist, or substitute the
-   name of a different existing login account that you plan to use
-   for running the server. For information about creating the
-   account, see Creating a mysql System User and Group, in Section
-   2.2, "Installing MySQL on Unix/Linux Using Generic Binaries."
+   server. It also suggests some commands that you can use to
+   test whether the server is accessible and working properly.
+   For information about starting and stopping the server
+   automatically, see Section 2.10.1.2, "Starting and Stopping
+   MySQL Automatically."
+
+   After you complete the procedure and have the server running,
+   you should assign passwords to the accounts created by
+   mysql_install_db and perhaps restrict access to test
+   databases. For instructions, see Section 2.10.2, "Securing
+   the Initial MySQL Accounts."
+
+   In the examples shown here, the server runs under the user ID
+   of the mysql login account. This assumes that such an account
+   exists. Either create the account if it does not exist, or
+   substitute the name of a different existing login account
+   that you plan to use for running the server. For information
+   about creating the account, see Creating a mysql System User
+   and Group, in Section 2.2, "Installing MySQL on Unix/Linux
+   Using Generic Binaries."
 
-    1. Change location into the top-level directory of your MySQL
-       installation, represented here by BASEDIR:
+    1. Change location into the top-level directory of your
+       MySQL installation, represented here by BASEDIR:
 shell> cd BASEDIR
-       BASEDIR is the installation directory for your MySQL instance.
-       It is likely to be something like /usr/local/mysql or
-       /usr/local. The following steps assume that you have changed
-       location to this directory.
-       You will find several files and subdirectories in the BASEDIR
-       directory. The most important for installation purposes are
-       the bin and scripts subdirectories:
+
+       BASEDIR is the installation directory for your MySQL
+       instance. It is likely to be something like
+       /usr/local/mysql or /usr/local. The following steps
+       assume that you have changed location to this directory.
+       You will find several files and subdirectories in the
+       BASEDIR directory. The most important for installation
+       purposes are the bin and scripts subdirectories:
 
           + The bin directory contains client programs and the
             server. You should add the full path name of this
-            directory to your PATH environment variable so that your
-            shell finds the MySQL programs properly. See Section
-            2.12, "Environment Variables."
+            directory to your PATH environment variable so that
+            your shell finds the MySQL programs properly. See
+            Section 2.12, "Environment Variables."
 
           + The scripts directory contains the mysql_install_db
-            script used to initialize the mysql database containing
-            the grant tables that store the server access
-            permissions.
+            program used to initialize the mysql database
+            containing the grant tables that store the server
+            access permissions.
 
     2. If necessary, ensure that the distribution contents are
        accessible to mysql. If you installed the distribution as
-       mysql, no further action is required. If you installed the
-       distribution as root, its contents will be owned by root.
-       Change its ownership to mysql by executing the following
-       commands as root in the installation directory. The first
-       command changes the owner attribute of the files to the mysql
-       user. The second changes the group attribute to the mysql
-       group.
+       mysql, no further action is required. If you installed
+       the distribution as root, its contents will be owned by
+       root. Change its ownership to mysql by executing the
+       following commands as root in the installation directory.
+       The first command changes the owner attribute of the
+       files to the mysql user. The second changes the group
+       attribute to the mysql group.
 shell> chown -R mysql .
 shell> chgrp -R mysql .
 
-    3. If necessary, run the mysql_install_db program to set up the
-       initial MySQL grant tables containing the privileges that
-       determine how users are permitted to connect to the server.
-       You will need to do this if you used a distribution type for
-       which the installation procedure does not run the program for
-       you.
+
+    3. If necessary, run the mysql_install_db program to set up
+       the initial MySQL grant tables containing the privileges
+       that determine how users are permitted to connect to the
+       server. You will need to do this if you used a
+       distribution type for which the installation procedure
+       does not run the program for you.
 shell> scripts/mysql_install_db --user=mysql
-       Typically, mysql_install_db needs to be run only the first
-       time you install MySQL, so you can skip this step if you are
-       upgrading an existing installation, However, mysql_install_db
-       does not overwrite any existing privilege tables, so it should
-       be safe to run in any circumstances.
+
+       Typically, mysql_install_db needs to be run only the
+       first time you install MySQL, so you can skip this step
+       if you are upgrading an existing installation, However,
+       mysql_install_db does not overwrite any existing
+       privilege tables, so it should be safe to run in any
+       circumstances.
        It might be necessary to specify other options such as
-       --basedir or --datadir if mysql_install_db does not identify
-       the correct locations for the installation directory or data
-       directory. For example:
+       --basedir or --datadir if mysql_install_db does not
+       identify the correct locations for the installation
+       directory or data directory. For example:
 shell> scripts/mysql_install_db --user=mysql \
          --basedir=/opt/mysql/mysql \
          --datadir=/opt/mysql/mysql/data
-       The mysql_install_db script creates the server's data
-       directory with mysql as the owner. Under the data directory,
-       it creates directories for the mysql database that holds the
-       grant tables and the test database that you can use to test
-       MySQL. The script also creates privilege table entries for
-       root and anonymous-user accounts. The accounts have no
-       passwords initially. Section 2.10.2, "Securing the Initial
-       MySQL Accounts," describes the initial privileges. Briefly,
-       these privileges permit the MySQL root user to do anything,
-       and permit anybody to create or use databases with a name of
+
+       The mysql_install_db program creates the server's data
+       directory with mysql as the owner. Under the data
+       directory, it creates directories for the mysql database
+       that holds the grant tables and the test database that
+       you can use to test MySQL. The script also creates
+       privilege table entries for root and anonymous-user
+       accounts. The accounts have no passwords initially.
+       Section 2.10.2, "Securing the Initial MySQL Accounts,"
+       describes the initial privileges. Briefly, these
+       privileges permit the MySQL root user to do anything, and
+       permit anybody to create or use databases with a name of
        test or starting with test_. See Section 6.2, "The MySQL
        Access Privilege System," for a complete listing and
        description of the grant tables.
-       It is important to make sure that the database directories and
-       files are owned by the mysql login account so that the server
-       has read and write access to them when you run it later. To
-       ensure this if you run mysql_install_db as root, include the
-       --user option as shown. Otherwise, you should execute the
-       script while logged in as mysql, in which case you can omit
-       the --user option from the command.
-       If you do not want to have the test database, you can remove
-       it after starting the server, using the instructions in
-       Section 2.10.2, "Securing the Initial MySQL Accounts."
-       If you have trouble with mysql_install_db at this point, see
-       Section 2.10.1.1, "Problems Running mysql_install_db."
-
-    4. Most of the MySQL installation can be owned by root if you
-       like. The exception is that the data directory must be owned
-       by mysql. To accomplish this, run the following commands as
-       root in the installation directory:
+       It is important to make sure that the database
+       directories and files are owned by the mysql login
+       account so that the server has read and write access to
+       them when you run it later. To ensure this if you run
+       mysql_install_db as root, include the --user option as
+       shown. Otherwise, you should execute the program while
+       logged in as mysql, in which case you can omit the --user
+       option from the command.
+       If you do not want to have the test database, you can
+       remove it after starting the server, using the
+       instructions in Section 2.10.2, "Securing the Initial
+       MySQL Accounts."
+       If you have trouble with mysql_install_db at this point,
+       see Section 2.10.1.1, "Problems Running
+       mysql_install_db."
+
+    4. Most of the MySQL installation can be owned by root if
+       you like. The exception is that the data directory must
+       be owned by mysql. To accomplish this, run the following
+       commands as root in the installation directory:
 shell> chown -R root .
 shell> chown -R mysql data
 
-    5. If the plugin directory (the directory named by the plugin_dir
-       system variable) is writable by the server, it may be possible
-       for a user to write executable code to a file in the directory
-       using SELECT ... INTO DUMPFILE. This can be prevented by
-       making plugin_dir read only to the server or by setting
-       --secure-file-priv to a directory where SELECT writes can be
-       made safely.
-
-    6. If you installed MySQL using a source distribution, you may
-       want to optionally copy one of the provided configuration
-       files from the support-files directory into your /etc
-       directory. There are different sample configuration files for
-       different use cases, server types, and CPU and RAM
-       configurations. If you want to use one of these standard
-       files, you should copy it to /etc/my.cnf, or /etc/mysql/my.cnf
-       and edit and check the configuration before starting your
-       MySQL server for the first time.
-       If you do not copy one of the standard configuration files,
-       the MySQL server will be started with the default settings.
-       If you want MySQL to start automatically when you boot your
-       machine, you can copy support-files/mysql.server to the
-       location where your system has its startup files. More
-       information can be found in the mysql.server script itself,
-       and in Section 2.10.1.2, "Starting and Stopping MySQL
-       Automatically."
+
+    5. If the plugin directory (the directory named by the
+       plugin_dir system variable) is writable by the server, it
+       may be possible for a user to write executable code to a
+       file in the directory using SELECT ... INTO DUMPFILE.
+       This can be prevented by making plugin_dir read only to
+       the server or by setting --secure-file-priv to a
+       directory where SELECT writes can be made safely.
+
+    6. If you installed MySQL using a source distribution, you
+       may want to optionally copy one of the provided
+       configuration files from the support-files directory into
+       your /etc directory. There are different sample
+       configuration files for different use cases, server
+       types, and CPU and RAM configurations. If you want to use
+       one of these standard files, you should copy it to
+       /etc/my.cnf, or /etc/mysql/my.cnf and edit and check the
+       configuration before starting your MySQL server for the
+       first time.
+       If you do not copy one of the standard configuration
+       files, the MySQL server will be started with the default
+       settings.
+       If you want MySQL to start automatically when you boot
+       your machine, you can copy support-files/mysql.server to
+       the location where your system has its startup files.
+       More information can be found in the mysql.server script
+       itself, and in Section 2.10.1.2, "Starting and Stopping
+       MySQL Automatically."
 
     7. Start the MySQL server:
 shell> bin/mysqld_safe --user=mysql &
+
        It is important that the MySQL server be run using an
-       unprivileged (non-root) login account. To ensure this if you
-       run mysqld_safe as root, include the --user option as shown.
-       Otherwise, you should execute the script while logged in as
-       mysql, in which case you can omit the --user option from the
-       command.
-       For further instructions for running MySQL as an unprivileged
-       user, see Section 6.1.5, "How to Run MySQL as a Normal User."
-       If the command fails immediately and prints mysqld ended, look
-       for information in the error log (which by default is the
-       host_name.err file in the data directory).
+       unprivileged (non-root) login account. To ensure this if
+       you run mysqld_safe as root, include the --user option as
+       shown. Otherwise, you should execute the program while
+       logged in as mysql, in which case you can omit the --user
+       option from the command.
+       For further instructions for running MySQL as an
+       unprivileged user, see Section 6.1.5, "How to Run MySQL
+       as a Normal User."
+       If the command fails immediately and prints mysqld ended,
+       look for information in the error log (which by default
+       is the host_name.err file in the data directory).
        If you neglected to create the grant tables by running
-       mysql_install_db before proceeding to this step, the following
-       message appears in the error log file when you start the
-       server:
+       mysql_install_db before proceeding to this step, the
+       following message appears in the error log file when you
+       start the server:
 mysqld: Can't find file: 'host.frm'
-       This error also occurs if you run mysql_install_db as root
-       without the --user option. Remove the data directory and run
-       mysql_install_db with the --user option as described
-       previously.
-       If you have other problems starting the server, see Section
-       2.10.1.3, "Starting and Troubleshooting the MySQL Server." For
-       more information about mysqld_safe, see Section 4.3.2,
-       "mysqld_safe --- MySQL Server Startup Script."
+
+       This error also occurs if you run mysql_install_db as
+       root without the --user option. Remove the data directory
+       and run mysql_install_db with the --user option as
+       described previously.
+       If you have other problems starting the server, see
+       Section 2.10.1.3, "Starting and Troubleshooting the MySQL
+       Server." For more information about mysqld_safe, see
+       Section 4.3.2, "mysqld_safe --- MySQL Server Startup
+       Script."
 
     8. Use mysqladmin to verify that the server is running. The
-       following commands provide simple tests to check whether the
-       server is up and responding to connections:
+       following commands provide simple tests to check whether
+       the server is up and responding to connections:
 shell> bin/mysqladmin version
 shell> bin/mysqladmin variables
-       The output from mysqladmin version varies slightly depending
-       on your platform and version of MySQL, but should be similar
-       to that shown here:
+
+       The output from mysqladmin version varies slightly
+       depending on your platform and version of MySQL, but
+       should be similar to that shown here:
 shell> bin/mysqladmin version
-mysqladmin  Ver 14.12 Distrib 5.5.41, for pc-linux-gnu on i686
+mysqladmin  Ver 14.12 Distrib 5.5.42, for pc-linux-gnu on i686
 ...
 
-Server version          5.5.41
+Server version          5.5.42
 Protocol version        10
 Connection              Localhost via UNIX socket
 UNIX socket             /var/lib/mysql/mysql.sock
@@ -6634,19 +7509,23 @@ Uptime:                 14 days 5 hours
 Threads: 1  Questions: 366  Slow queries: 0
 Opens: 0  Flush tables: 1  Open tables: 19
 Queries per second avg: 0.000
-       To see what else you can do with mysqladmin, invoke it with
-       the --help option.
+
+       To see what else you can do with mysqladmin, invoke it
+       with the --help option.
 
     9. Verify that you can shut down the server:
 shell> bin/mysqladmin -u root shutdown
-   10. Verify that you can start the server again. Do this by using
-       mysqld_safe or by invoking mysqld directly. For example:
+
+   10. Verify that you can start the server again. Do this by
+       using mysqld_safe or by invoking mysqld directly. For
+       example:
 shell> bin/mysqld_safe --user=mysql &
+
        If mysqld_safe fails, see Section 2.10.1.3, "Starting and
        Troubleshooting the MySQL Server."
    11. Run some simple tests to verify that you can retrieve
-       information from the server. The output should be similar to
-       what is shown here:
+       information from the server. The output should be similar
+       to what is shown here:
 shell> bin/mysqlshow
 +--------------------+
 |     Databases      |
@@ -6690,187 +7569,211 @@ shell> bin/mysql -e "SELECT Host,Db,User
 | %    | test   |      |
 | %    | test_% |      |
 +------+--------+------+
-   12. There is a benchmark suite in the sql-bench directory (under
-       the MySQL installation directory) that you can use to compare
-       how MySQL performs on different platforms. The benchmark suite
-       is written in Perl. It requires the Perl DBI module that
-       provides a database-independent interface to the various
-       databases, and some other additional Perl modules:
+
+   12. There is a benchmark suite in the sql-bench directory
+       (under the MySQL installation directory) that you can use
+       to compare how MySQL performs on different platforms. The
+       benchmark suite is written in Perl. It requires the Perl
+       DBI module that provides a database-independent interface
+       to the various databases, and some other additional Perl
+       modules:
 DBI
 DBD::mysql
 Data::Dumper
 Data::ShowTable
+
        These modules can be obtained from CPAN
-       (http://www.cpan.org/). See also Section 2.13.1, "Installing
-       Perl on Unix."
-       The sql-bench/Results directory contains the results from many
-       runs against different databases and platforms. To run all
-       tests, execute these commands:
+       (http://www.cpan.org/). See also Section 2.13.1,
+       "Installing Perl on Unix."
+       The sql-bench/Results directory contains the results from
+       many runs against different databases and platforms. To
+       run all tests, execute these commands:
 shell> cd sql-bench
 shell> perl run-all-tests
+
        If you do not have the sql-bench directory, you probably
-       installed MySQL using RPM files other than the source RPM.
-       (The source RPM includes the sql-bench benchmark directory.)
-       In this case, you must first install the benchmark suite
-       before you can use it. There are separate benchmark RPM files
-       named mysql-bench-VERSION.i386.rpm that contain benchmark code
-       and data.
-       If you have a source distribution, there are also tests in its
-       tests subdirectory that you can run. For example, to run
-       auto_increment.tst, execute this command from the top-level
-       directory of your source distribution:
+       installed MySQL using RPM files other than the source
+       RPM. (The source RPM includes the sql-bench benchmark
+       directory.) In this case, you must first install the
+       benchmark suite before you can use it. There are separate
+       benchmark RPM files named mysql-bench-VERSION.i386.rpm
+       that contain benchmark code and data.
+       If you have a source distribution, there are also tests
+       in its tests subdirectory that you can run. For example,
+       to run auto_increment.tst, execute this command from the
+       top-level directory of your source distribution:
 shell> mysql -vvf test < ./tests/auto_increment.tst
+
        The expected result of the test can be found in the
        ./tests/auto_increment.res file.
-   13. At this point, you should have the server running. However,
-       none of the initial MySQL accounts have a password, and the
-       server permits permissive access to test databases. To tighten
-       security, follow the instructions in Section 2.10.2, "Securing
-       the Initial MySQL Accounts."
-
-   The MySQL 5.5 installation procedure creates time zone tables in
-   the mysql database but does not populate them. To do so, use the
-   instructions in Section 10.6, "MySQL Server Time Zone Support."
-
-   To make it more convenient to invoke programs installed in the bin
-   directory under the installation directory, you can add that
-   directory to your PATH environment variable setting. That enables
-   you to run a program by typing only its name, not its entire path
-   name. See Section 4.2.10, "Setting Environment Variables."
+   13. At this point, you should have the server running.
+       However, none of the initial MySQL accounts have a
+       password, and the server permits permissive access to
+       test databases. To tighten security, follow the
+       instructions in Section 2.10.2, "Securing the Initial
+       MySQL Accounts."
+
+   The MySQL 5.5 installation procedure creates time zone tables
+   in the mysql database but does not populate them. To do so,
+   use the instructions in Section 10.6, "MySQL Server Time Zone
+   Support."
+
+   To make it more convenient to invoke programs installed in
+   the bin directory under the installation directory, you can
+   add that directory to your PATH environment variable setting.
+   That enables you to run a program by typing only its name,
+   not its entire path name. See Section 4.2.10, "Setting
+   Environment Variables."
 
    You can set up new accounts using the bin/mysql_setpermission
-   script if you install the DBI and DBD::mysql Perl modules. See
-   Section 4.6.13, "mysql_setpermission --- Interactively Set
-   Permissions in Grant Tables." For Perl module installation
-   instructions, see Section 2.13, "Perl Installation Notes."
+   script if you install the DBI and DBD::mysql Perl modules.
+   See Section 4.6.13, "mysql_setpermission --- Interactively
+   Set Permissions in Grant Tables." For Perl module
+   installation instructions, see Section 2.13, "Perl
+   Installation Notes."
 
    If you would like to use mysqlaccess and have the MySQL
-   distribution in some nonstandard location, you must change the
-   location where mysqlaccess expects to find the mysql client. Edit
-   the bin/mysqlaccess script at approximately line 18. Search for a
-   line that looks like this:
+   distribution in some nonstandard location, you must change
+   the location where mysqlaccess expects to find the mysql
+   client. Edit the bin/mysqlaccess script at approximately line
+   18. Search for a line that looks like this:
 $MYSQL     = '/usr/local/bin/mysql';    # path to mysql executable
 
-   Change the path to reflect the location where mysql actually is
-   stored on your system. If you do not do this, a Broken pipe error
-   will occur when you run mysqlaccess.
+   Change the path to reflect the location where mysql actually
+   is stored on your system. If you do not do this, a Broken
+   pipe error will occur when you run mysqlaccess.
 
 2.10.1.1 Problems Running mysql_install_db
 
-   The purpose of the mysql_install_db script is to generate new
-   MySQL privilege tables. It does not overwrite existing MySQL
-   privilege tables, and it does not affect any other data.
-
-   If you want to re-create your privilege tables, first stop the
-   mysqld server if it is running. Then rename the mysql directory
-   under the data directory to save it, and then run
-   mysql_install_db. Suppose that your current directory is the MySQL
-   installation directory and that mysql_install_db is located in the
-   bin directory and the data directory is named data. To rename the
-   mysql database and re-run mysql_install_db, use these commands.
+   The purpose of the mysql_install_db program is to generate
+   new MySQL privilege tables. It does not overwrite existing
+   MySQL privilege tables, and it does not affect any other
+   data.
+
+   If you want to re-create your privilege tables, first stop
+   the mysqld server if it is running. Then rename the mysql
+   directory under the data directory to save it, and then run
+   mysql_install_db. Suppose that your current directory is the
+   MySQL installation directory and that mysql_install_db is
+   located in the bin directory and the data directory is named
+   data. To rename the mysql database and re-run
+   mysql_install_db, use these commands.
 shell> mv data/mysql data/mysql.old
 shell> scripts/mysql_install_db --user=mysql
 
-   When you run mysql_install_db, you might encounter the following
-   problems:
+   When you run mysql_install_db, you might encounter the
+   following problems:
 
      * mysql_install_db fails to install the grant tables
-       You may find that mysql_install_db fails to install the grant
-       tables and terminates after displaying the following messages:
+       You may find that mysql_install_db fails to install the
+       grant tables and terminates after displaying the
+       following messages:
 Starting mysqld daemon with databases from XXXXXX
 mysqld ended
+
        In this case, you should examine the error log file very
-       carefully. The log should be located in the directory XXXXXX
-       named by the error message and should indicate why mysqld did
-       not start. If you do not understand what happened, include the
-       log when you post a bug report. See Section 1.7, "How to
-       Report Bugs or Problems."
+       carefully. The log should be located in the directory
+       XXXXXX named by the error message and should indicate why
+       mysqld did not start. If you do not understand what
+       happened, include the log when you post a bug report. See
+       Section 1.7, "How to Report Bugs or Problems."
 
      * There is a mysqld process running
-       This indicates that the server is running, in which case the
-       grant tables have probably been created already. If so, there
-       is no need to run mysql_install_db at all because it needs to
-       be run only once (when you install MySQL the first time).
+       This indicates that the server is running, in which case
+       the grant tables have probably been created already. If
+       so, there is no need to run mysql_install_db at all
+       because it needs to be run only once (when you install
+       MySQL the first time).
 
      * Installing a second mysqld server does not work when one
        server is running
-       This can happen when you have an existing MySQL installation,
-       but want to put a new installation in a different location.
-       For example, you might have a production installation, but you
-       want to create a second installation for testing purposes.
-       Generally the problem that occurs when you try to run a second
-       server is that it tries to use a network interface that is in
-       use by the first server. In this case, you should see one of
-       the following error messages:
+       This can happen when you have an existing MySQL
+       installation, but want to put a new installation in a
+       different location. For example, you might have a
+       production installation, but you want to create a second
+       installation for testing purposes. Generally the problem
+       that occurs when you try to run a second server is that
+       it tries to use a network interface that is in use by the
+       first server. In this case, you should see one of the
+       following error messages:
 Can't start server: Bind on TCP/IP port:
 Address already in use
 Can't start server: Bind on unix socket...
-       For instructions on setting up multiple servers, see Section
-       5.3, "Running Multiple MySQL Instances on One Machine."
+
+       For instructions on setting up multiple servers, see
+       Section 5.3, "Running Multiple MySQL Instances on One
+       Machine."
 
      * You do not have write access to the /tmp directory
-       If you do not have write access to create temporary files or a
-       Unix socket file in the default location (the /tmp directory)
-       or the TMP_DIR environment variable, if it has been set, an
-       error occurs when you run mysql_install_db or the mysqld
-       server.
+       If you do not have write access to create temporary files
+       or a Unix socket file in the default location (the /tmp
+       directory) or the TMP_DIR environment variable, if it has
+       been set, an error occurs when you run mysql_install_db
+       or the mysqld server.
        You can specify different locations for the temporary
-       directory and Unix socket file by executing these commands
-       prior to starting mysql_install_db or mysqld, where
-       some_tmp_dir is the full path name to some directory for which
-       you have write permission:
+       directory and Unix socket file by executing these
+       commands prior to starting mysql_install_db or mysqld,
+       where some_tmp_dir is the full path name to some
+       directory for which you have write permission:
 shell> TMPDIR=/some_tmp_dir/
 shell> MYSQL_UNIX_PORT=/some_tmp_dir/mysql.sock
 shell> export TMPDIR MYSQL_UNIX_PORT
-       Then you should be able to run mysql_install_db and start the
-       server with these commands:
+
+       Then you should be able to run mysql_install_db and start
+       the server with these commands:
 shell> scripts/mysql_install_db --user=mysql
 shell> bin/mysqld_safe --user=mysql &
+
        If mysql_install_db is located in the scripts directory,
        modify the first command to scripts/mysql_install_db.
-       See Section B.5.4.5, "How to Protect or Change the MySQL Unix
-       Socket File," and Section 2.12, "Environment Variables."
+       See Section B.5.4.5, "How to Protect or Change the MySQL
+       Unix Socket File," and Section 2.12, "Environment
+       Variables."
 
-   There are some alternatives to running the mysql_install_db script
-   provided in the MySQL distribution:
+   There are some alternatives to running the mysql_install_db
+   program provided in the MySQL distribution:
 
-     * If you want the initial privileges to be different from the
-       standard defaults, you can modify mysql_install_db before you
-       run it. However, it is preferable to use GRANT and REVOKE to
-       change the privileges after the grant tables have been set up.
-       In other words, you can run mysql_install_db, and then use
-       mysql -u root mysql to connect to the server as the MySQL root
-       user so that you can issue the necessary GRANT and REVOKE
-       statements.
-       If you want to install MySQL on several machines with the same
-       privileges, you can put the GRANT and REVOKE statements in a
-       file and execute the file as a script using mysql after
-       running mysql_install_db. For example:
+     * If you want the initial privileges to be different from
+       the standard defaults, you can modify mysql_install_db
+       before you run it. However, it is preferable to use GRANT
+       and REVOKE to change the privileges after the grant
+       tables have been set up. In other words, you can run
+       mysql_install_db, and then use mysql -u root mysql to
+       connect to the server as the MySQL root user so that you
+       can issue the necessary GRANT and REVOKE statements.
+       If you want to install MySQL on several machines with the
+       same privileges, you can put the GRANT and REVOKE
+       statements in a file and execute the file as a script
+       using mysql after running mysql_install_db. For example:
 shell> scripts/mysql_install_db --user=mysql
 shell> bin/mysql -u root < your_script_file
-       By doing this, you can avoid having to issue the statements
-       manually on each machine.
 
-     * It is possible to re-create the grant tables completely after
-       they have previously been created. You might want to do this
-       if you are just learning how to use GRANT and REVOKE and have
-       made so many modifications after running mysql_install_db that
-       you want to wipe out the tables and start over.
-       To re-create the grant tables, remove all the .frm, .MYI, and
-       .MYD files in the mysql database directory. Then run the
-       mysql_install_db script again.
+       By doing this, you can avoid having to issue the
+       statements manually on each machine.
 
-     * You can start mysqld manually using the --skip-grant-tables
-       option and add the privilege information yourself using mysql:
+     * It is possible to re-create the grant tables completely
+       after they have previously been created. You might want
+       to do this if you are just learning how to use GRANT and
+       REVOKE and have made so many modifications after running
+       mysql_install_db that you want to wipe out the tables and
+       start over.
+       To re-create the grant tables, remove all the .frm, .MYI,
+       and .MYD files in the mysql database directory. Then run
+       the mysql_install_db program again.
+
+     * You can start mysqld manually using the
+       --skip-grant-tables option and add the privilege
+       information yourself using mysql:
 shell> bin/mysqld_safe --user=mysql --skip-grant-tables &
 shell> bin/mysql mysql
-       From mysql, manually execute the SQL commands contained in
-       mysql_install_db. Make sure that you run mysqladmin
-       flush-privileges or mysqladmin reload afterward to tell the
-       server to reload the grant tables.
-       Note that by not using mysql_install_db, you not only have to
-       populate the grant tables manually, you also have to create
-       them first.
+
+       From mysql, manually execute the SQL commands contained
+       in mysql_install_db. Make sure that you run mysqladmin
+       flush-privileges or mysqladmin reload afterward to tell
+       the server to reload the grant tables.
+       Note that by not using mysql_install_db, you not only
+       have to populate the grant tables manually, you also have
+       to create them first.
 
 2.10.1.2 Starting and Stopping MySQL Automatically
 
@@ -6879,62 +7782,64 @@ shell> bin/mysql mysql
      * Invoke mysqld directly. This works on any platform.
 
      * Invoke mysqld_safe, which tries to determine the proper
-       options for mysqld and then runs it with those options. This
-       script is used on Unix and Unix-like systems. See Section
-       4.3.2, "mysqld_safe --- MySQL Server Startup Script."
-
-     * Invoke mysql.server. This script is used primarily at system
-       startup and shutdown on systems that use System V-style run
-       directories (that is, /etc/init.d and run-level specific
-       directories), where it usually is installed under the name
-       mysql. The mysql.server script starts the server by invoking
-       mysqld_safe. See Section 4.3.3, "mysql.server --- MySQL Server
-       Startup Script."
-
-     * On Mac OS X, install a separate MySQL Startup Item package to
-       enable the automatic startup of MySQL on system startup. The
-       Startup Item starts the server by invoking mysql.server. See
-       Section 2.4.3, "Installing the MySQL Startup Item," for
-       details. A MySQL Preference Pane also provides control for
-       starting and stopping MySQL through the System Preferences,
-       see Section 2.4.4, "Installing and Using the MySQL Preference
-       Pane."
-
-     * Use the Solaris/OpenSolaris service management framework (SMF)
-       system to initiate and control MySQL startup. For more
-       information, see Section 2.7.2, "Installing MySQL on
+       options for mysqld and then runs it with those options.
+       This script is used on Unix and Unix-like systems. See
+       Section 4.3.2, "mysqld_safe --- MySQL Server Startup
+       Script."
+
+     * Invoke mysql.server. This script is used primarily at
+       system startup and shutdown on systems that use System
+       V-style run directories (that is, /etc/init.d and
+       run-level specific directories), where it usually is
+       installed under the name mysql. The mysql.server script
+       starts the server by invoking mysqld_safe. See Section
+       4.3.3, "mysql.server --- MySQL Server Startup Script."
+
+     * On Mac OS X, install a separate MySQL Startup Item
+       package to enable the automatic startup of MySQL on
+       system startup. The Startup Item starts the server by
+       invoking mysql.server. See Section 2.4.4, "Installing the
+       MySQL Startup Item," for details. A MySQL Preference Pane
+       also provides control for starting and stopping MySQL
+       through the System Preferences, see Section 2.4.5,
+       "Installing and Using the MySQL Preference Pane."
+
+     * Use the Solaris/OpenSolaris service management framework
+       (SMF) system to initiate and control MySQL startup. For
+       more information, see Section 2.7.2, "Installing MySQL on
        OpenSolaris Using IPS."
 
-   The mysqld_safe and mysql.server scripts, Solaris/OpenSolaris SMF,
-   and the Mac OS X Startup Item (or MySQL Preference Pane) can be
-   used to start the server manually, or automatically at system
-   startup time. mysql.server and the Startup Item also can be used
-   to stop the server.
+   The mysqld_safe and mysql.server scripts, Solaris/OpenSolaris
+   SMF, and the Mac OS X Startup Item (or MySQL Preference Pane)
+   can be used to start the server manually, or automatically at
+   system startup time. mysql.server and the Startup Item also
+   can be used to stop the server.
 
    To start or stop the server manually using the mysql.server
    script, invoke it with start or stop arguments:
 shell> mysql.server start
 shell> mysql.server stop
 
-   Before mysql.server starts the server, it changes location to the
-   MySQL installation directory, and then invokes mysqld_safe. If you
-   want the server to run as some specific user, add an appropriate
-   user option to the [mysqld] group of the /etc/my.cnf option file,
-   as shown later in this section. (It is possible that you will need
-   to edit mysql.server if you've installed a binary distribution of
-   MySQL in a nonstandard location. Modify it to change location into
-   the proper directory before it runs mysqld_safe. If you do this,
-   your modified version of mysql.server may be overwritten if you
-   upgrade MySQL in the future, so you should make a copy of your
-   edited version that you can reinstall.)
+   Before mysql.server starts the server, it changes location to
+   the MySQL installation directory, and then invokes
+   mysqld_safe. If you want the server to run as some specific
+   user, add an appropriate user option to the [mysqld] group of
+   the /etc/my.cnf option file, as shown later in this section.
+   (It is possible that you will need to edit mysql.server if
+   you've installed a binary distribution of MySQL in a
+   nonstandard location. Modify it to change location into the
+   proper directory before it runs mysqld_safe. If you do this,
+   your modified version of mysql.server may be overwritten if
+   you upgrade MySQL in the future, so you should make a copy of
+   your edited version that you can reinstall.)
 
-   mysql.server stop stops the server by sending a signal to it. You
-   can also stop the server manually by executing mysqladmin
+   mysql.server stop stops the server by sending a signal to it.
+   You can also stop the server manually by executing mysqladmin
    shutdown.
 
-   To start and stop MySQL automatically on your server, you need to
-   add start and stop commands to the appropriate places in your
-   /etc/rc* files.
+   To start and stop MySQL automatically on your server, you
+   need to add start and stop commands to the appropriate places
+   in your /etc/rc* files.
 
    If you use the Linux server RPM package
    (MySQL-server-VERSION.rpm), or a native Linux package
@@ -6943,34 +7848,34 @@ shell> mysql.server stop
    "Installing MySQL on Linux Using RPM Packages," for more
    information on the Linux RPM packages.
 
-   Some vendors provide RPM packages that install a startup script
-   under a different name such as mysqld.
+   Some vendors provide RPM packages that install a startup
+   script under a different name such as mysqld.
 
-   If you install MySQL from a source distribution or using a binary
-   distribution format that does not install mysql.server
+   If you install MySQL from a source distribution or using a
+   binary distribution format that does not install mysql.server
    automatically, you can install it manually. The script can be
-   found in the support-files directory under the MySQL installation
-   directory or in a MySQL source tree.
+   found in the support-files directory under the MySQL
+   installation directory or in a MySQL source tree.
 
    To install mysql.server manually, copy it to the /etc/init.d
-   directory with the name mysql, and then make it executable. Do
-   this by changing location into the appropriate directory where
-   mysql.server is located and executing these commands:
+   directory with the name mysql, and then make it executable.
+   Do this by changing location into the appropriate directory
+   where mysql.server is located and executing these commands:
 shell> cp mysql.server /etc/init.d/mysql
 shell> chmod +x /etc/init.d/mysql
 
    Note
 
-   Older Red Hat systems use the /etc/rc.d/init.d directory rather
-   than /etc/init.d. Adjust the preceding commands accordingly.
-   Alternatively, first create /etc/init.d as a symbolic link that
-   points to /etc/rc.d/init.d:
+   Older Red Hat systems use the /etc/rc.d/init.d directory
+   rather than /etc/init.d. Adjust the preceding commands
+   accordingly. Alternatively, first create /etc/init.d as a
+   symbolic link that points to /etc/rc.d/init.d:
 shell> cd /etc
 shell> ln -s rc.d/init.d .
 
-   After installing the script, the commands needed to activate it to
-   run at system startup depend on your operating system. On Linux,
-   you can use chkconfig:
+   After installing the script, the commands needed to activate
+   it to run at system startup depend on your operating system.
+   On Linux, you can use chkconfig:
 shell> chkconfig --add mysql
 
    On some Linux systems, the following command also seems to be
@@ -6978,25 +7883,26 @@ shell> chkconfig --add mysql
 shell> chkconfig --level 345 mysql on
 
    On FreeBSD, startup scripts generally should go in
-   /usr/local/etc/rc.d/. The rc(8) manual page states that scripts in
-   this directory are executed only if their basename matches the
-   *.sh shell file name pattern. Any other files or directories
-   present within the directory are silently ignored. In other words,
-   on FreeBSD, you should install the mysql.server script as
-   /usr/local/etc/rc.d/mysql.server.sh to enable automatic startup.
-
-   As an alternative to the preceding setup, some operating systems
-   also use /etc/rc.local or /etc/init.d/boot.local to start
-   additional services on startup. To start up MySQL using this
-   method, you could append a command like the one following to the
-   appropriate startup file:
+   /usr/local/etc/rc.d/. The rc(8) manual page states that
+   scripts in this directory are executed only if their basename
+   matches the *.sh shell file name pattern. Any other files or
+   directories present within the directory are silently
+   ignored. In other words, on FreeBSD, you should install the
+   mysql.server script as /usr/local/etc/rc.d/mysql.server.sh to
+   enable automatic startup.
+
+   As an alternative to the preceding setup, some operating
+   systems also use /etc/rc.local or /etc/init.d/boot.local to
+   start additional services on startup. To start up MySQL using
+   this method, you could append a command like the one
+   following to the appropriate startup file:
 /bin/sh -c 'cd /usr/local/mysql; ./bin/mysqld_safe --user=mysql &'
 
-   For other systems, consult your operating system documentation to
-   see how to install startup scripts.
+   For other systems, consult your operating system
+   documentation to see how to install startup scripts.
 
-   You can add options for mysql.server in a global /etc/my.cnf file.
-   A typical /etc/my.cnf file might look like this:
+   You can add options for mysql.server in a global /etc/my.cnf
+   file. A typical /etc/my.cnf file might look like this:
 [mysqld]
 datadir=/usr/local/mysql/var
 socket=/var/tmp/mysql.sock
@@ -7006,13 +7912,14 @@ user=mysql
 [mysql.server]
 basedir=/usr/local/mysql
 
-   The mysql.server script supports the following options: basedir,
-   datadir, and pid-file. If specified, they must be placed in an
-   option file, not on the command line. mysql.server supports only
-   start and stop as command-line arguments.
+   The mysql.server script supports the following options:
+   basedir, datadir, and pid-file. If specified, they must be
+   placed in an option file, not on the command line.
+   mysql.server supports only start and stop as command-line
+   arguments.
 
-   The following table shows which option groups the server and each
-   startup script read from option files.
+   The following table shows which option groups the server and
+   each startup script read from option files.
 
    Table 2.17 MySQL Startup scripts and supported server option
    groups
@@ -7022,95 +7929,98 @@ basedir=/usr/local/mysql
    mysql.server [mysqld], [mysql.server], [server]
 
    [mysqld-major_version] means that groups with names like
-   [mysqld-5.1] and [mysqld-5.5] are read by servers having versions
-   5.1.x, 5.5.x, and so forth. This feature can be used to specify
-   options that can be read only by servers within a given release
-   series.
+   [mysqld-5.1] and [mysqld-5.5] are read by servers having
+   versions 5.1.x, 5.5.x, and so forth. This feature can be used
+   to specify options that can be read only by servers within a
+   given release series.
 
    For backward compatibility, mysql.server also reads the
-   [mysql_server] group and mysqld_safe also reads the [safe_mysqld]
-   group. However, you should update your option files to use the
-   [mysql.server] and [mysqld_safe] groups instead when using MySQL
-   5.5.
+   [mysql_server] group and mysqld_safe also reads the
+   [safe_mysqld] group. However, you should update your option
+   files to use the [mysql.server] and [mysqld_safe] groups
+   instead when using MySQL 5.5.
 
    For more information on MySQL configuration files and their
-   structure and contents, see Section 4.2.6, "Using Option Files."
+   structure and contents, see Section 4.2.6, "Using Option
+   Files."
 
 2.10.1.3 Starting and Troubleshooting the MySQL Server
 
-   This section provides troubleshooting suggestions for problems
-   starting the server on a Unix-like system. If you are using
-   Windows, see Section 2.3.8, "Troubleshooting a Microsoft Windows
-   MySQL Server Installation."
+   This section provides troubleshooting suggestions for
+   problems starting the server on a Unix-like system. If you
+   are using Windows, see Section 2.3.8, "Troubleshooting a
+   Microsoft Windows MySQL Server Installation."
 
-   If you have problems starting the server, here are some things to
-   try:
+   If you have problems starting the server, here are some
+   things to try:
 
      * Check the error log to see why the server does not start.
 
-     * Specify any special options needed by the storage engines you
-       are using.
+     * Specify any special options needed by the storage engines
+       you are using.
 
      * Make sure that the server knows where to find the data
        directory.
 
-     * Make sure that the server can access the data directory. The
-       ownership and permissions of the data directory and its
-       contents must be set such that the server can read and modify
-       them.
-
-     * Verify that the network interfaces the server wants to use are
-       available.
-
-   Some storage engines have options that control their behavior. You
-   can create a my.cnf file and specify startup options for the
-   engines that you plan to use. If you are going to use storage
-   engines that support transactional tables (InnoDB, NDB), be sure
-   that you have them configured the way you want before starting the
-   server:
+     * Make sure that the server can access the data directory.
+       The ownership and permissions of the data directory and
+       its contents must be set such that the server can read
+       and modify them.
+
+     * Verify that the network interfaces the server wants to
+       use are available.
+
+   Some storage engines have options that control their
+   behavior. You can create a my.cnf file and specify startup
+   options for the engines that you plan to use. If you are
+   going to use storage engines that support transactional
+   tables (InnoDB, NDB), be sure that you have them configured
+   the way you want before starting the server:
 
    If you are using InnoDB tables, see Section 14.6, "InnoDB
    Configuration."
 
    Storage engines will use default option values if you specify
-   none, but it is recommended that you review the available options
-   and specify explicit values for those for which the defaults are
-   not appropriate for your installation.
-
-   When the mysqld server starts, it changes location to the data
-   directory. This is where it expects to find databases and where it
-   expects to write log files. The server also writes the pid
-   (process ID) file in the data directory.
-
-   The data directory location is hardwired in when the server is
-   compiled. This is where the server looks for the data directory by
-   default. If the data directory is located somewhere else on your
-   system, the server will not work properly. You can determine what
-   the default path settings are by invoking mysqld with the
-   --verbose and --help options.
+   none, but it is recommended that you review the available
+   options and specify explicit values for those for which the
+   defaults are not appropriate for your installation.
+
+   When the mysqld server starts, it changes location to the
+   data directory. This is where it expects to find databases
+   and where it expects to write log files. The server also
+   writes the pid (process ID) file in the data directory.
+
+   The data directory location is hardwired in when the server
+   is compiled. This is where the server looks for the data
+   directory by default. If the data directory is located
+   somewhere else on your system, the server will not work
+   properly. You can determine what the default path settings
+   are by invoking mysqld with the --verbose and --help options.
 
    If the default locations do not match the MySQL installation
-   layout on your system, you can override them by specifying options
-   to mysqld or mysqld_safe on the command line or in an option file.
-
-   To specify the location of the data directory explicitly, use the
-   --datadir option. However, normally you can tell mysqld the
-   location of the base directory under which MySQL is installed and
-   it looks for the data directory there. You can do this with the
-   --basedir option.
-
-   To check the effect of specifying path options, invoke mysqld with
-   those options followed by the --verbose and --help options. For
-   example, if you change location into the directory where mysqld is
-   installed and then run the following command, it shows the effect
-   of starting the server with a base directory of /usr/local:
+   layout on your system, you can override them by specifying
+   options to mysqld or mysqld_safe on the command line or in an
+   option file.
+
+   To specify the location of the data directory explicitly, use
+   the --datadir option. However, normally you can tell mysqld
+   the location of the base directory under which MySQL is
+   installed and it looks for the data directory there. You can
+   do this with the --basedir option.
+
+   To check the effect of specifying path options, invoke mysqld
+   with those options followed by the --verbose and --help
+   options. For example, if you change location into the
+   directory where mysqld is installed and then run the
+   following command, it shows the effect of starting the server
+   with a base directory of /usr/local:
 shell> ./mysqld --basedir=/usr/local --verbose --help
 
    You can specify other options such as --datadir as well, but
    --verbose and --help must be the last options.
 
-   Once you determine the path settings you want, start the server
-   without --verbose and --help.
+   Once you determine the path settings you want, start the
+   server without --verbose and --help.
 
    If mysqld is currently running, you can find out what path
    settings it is using by executing this command:
@@ -7123,138 +8033,145 @@ shell> mysqladmin -h host_name variables
 
    If you get Errcode 13 (which means Permission denied) when
    starting mysqld, this means that the privileges of the data
-   directory or its contents do not permit server access. In this
-   case, you change the permissions for the involved files and
-   directories so that the server has the right to use them. You can
-   also start the server as root, but this raises security issues and
-   should be avoided.
-
-   Change location into the data directory and check the ownership of
-   the data directory and its contents to make sure the server has
-   access. For example, if the data directory is
+   directory or its contents do not permit server access. In
+   this case, you change the permissions for the involved files
+   and directories so that the server has the right to use them.
+   You can also start the server as root, but this raises
+   security issues and should be avoided.
+
+   Change location into the data directory and check the
+   ownership of the data directory and its contents to make sure
+   the server has access. For example, if the data directory is
    /usr/local/mysql/var, use this command:
 shell> ls -la /usr/local/mysql/var
 
-   If the data directory or its files or subdirectories are not owned
-   by the login account that you use for running the server, change
-   their ownership to that account. If the account is named mysql,
-   use these commands:
+   If the data directory or its files or subdirectories are not
+   owned by the login account that you use for running the
+   server, change their ownership to that account. If the
+   account is named mysql, use these commands:
 shell> chown -R mysql /usr/local/mysql/var
 shell> chgrp -R mysql /usr/local/mysql/var
 
-   If it possible that even with correct ownership, MySQL may fail to
-   start up if there is other security software running on your
-   system that manages application access to various parts of the
-   file system. In this case, you may need to reconfigure that
-   software to enable mysqld to access the directories it uses during
-   normal operation.
-
-   If the server fails to start up correctly, check the error log.
-   Log files are located in the data directory (typically C:\Program
-   Files\MySQL\MySQL Server 5.5\data on Windows,
-   /usr/local/mysql/data for a Unix/Linux binary distribution, and
-   /usr/local/var for a Unix/Linux source distribution). Look in the
-   data directory for files with names of the form host_name.err and
-   host_name.log, where host_name is the name of your server host.
-   Then examine the last few lines of these files. You can use tail
-   to display them:
+   If it possible that even with correct ownership, MySQL may
+   fail to start up if there is other security software running
+   on your system that manages application access to various
+   parts of the file system. In this case, you may need to
+   reconfigure that software to enable mysqld to access the
+   directories it uses during normal operation.
+
+   If the server fails to start up correctly, check the error
+   log. Log files are located in the data directory (typically
+   C:\Program Files\MySQL\MySQL Server 5.5\data on Windows,
+   /usr/local/mysql/data for a Unix/Linux binary distribution,
+   and /usr/local/var for a Unix/Linux source distribution).
+   Look in the data directory for files with names of the form
+   host_name.err and host_name.log, where host_name is the name
+   of your server host. Then examine the last few lines of these
+   files. You can use tail to display them:
 shell> tail host_name.err
 shell> tail host_name.log
 
-   The error log should contain information that indicates why the
-   server could not start.
+   The error log should contain information that indicates why
+   the server could not start.
 
-   If either of the following errors occur, it means that some other
-   program (perhaps another mysqld server) is using the TCP/IP port
-   or Unix socket file that mysqld is trying to use:
+   If either of the following errors occur, it means that some
+   other program (perhaps another mysqld server) is using the
+   TCP/IP port or Unix socket file that mysqld is trying to use:
 Can't start server: Bind on TCP/IP port: Address already in use
 Can't start server: Bind on unix socket...
 
    Use ps to determine whether you have another mysqld server
-   running. If so, shut down the server before starting mysqld again.
-   (If another server is running, and you really want to run multiple
-   servers, you can find information about how to do so in Section
-   5.3, "Running Multiple MySQL Instances on One Machine.")
-
-   If no other server is running, try to execute the command telnet
-   your_host_name tcp_ip_port_number. (The default MySQL port number
-   is 3306.) Then press Enter a couple of times. If you do not get an
-   error message like telnet: Unable to connect to remote host:
-   Connection refused, some other program is using the TCP/IP port
-   that mysqld is trying to use. You will need to track down what
-   program this is and disable it, or else tell mysqld to listen to a
-   different port with the --port option. In this case, you will also
-   need to specify the port number for client programs when
-   connecting to the server using TCP/IP.
-
-   Another reason the port might be inaccessible is that you have a
-   firewall running that blocks connections to it. If so, modify the
-   firewall settings to permit access to the port.
+   running. If so, shut down the server before starting mysqld
+   again. (If another server is running, and you really want to
+   run multiple servers, you can find information about how to
+   do so in Section 5.3, "Running Multiple MySQL Instances on
+   One Machine.")
+
+   If no other server is running, try to execute the command
+   telnet your_host_name tcp_ip_port_number. (The default MySQL
+   port number is 3306.) Then press Enter a couple of times. If
+   you do not get an error message like telnet: Unable to
+   connect to remote host: Connection refused, some other
+   program is using the TCP/IP port that mysqld is trying to
+   use. You will need to track down what program this is and
+   disable it, or else tell mysqld to listen to a different port
+   with the --port option. In this case, you will also need to
+   specify the port number for client programs when connecting
+   to the server using TCP/IP.
+
+   Another reason the port might be inaccessible is that you
+   have a firewall running that blocks connections to it. If so,
+   modify the firewall settings to permit access to the port.
 
-   If the server starts but you cannot connect to it, you should make
-   sure that you have an entry in /etc/hosts that looks like this:
+   If the server starts but you cannot connect to it, you should
+   make sure that you have an entry in /etc/hosts that looks
+   like this:
 127.0.0.1       localhost
 
-   If you cannot get mysqld to start, you can try to make a trace
-   file to find the problem by using the --debug option. See Section
-   24.4.3, "The DBUG Package."
+   If you cannot get mysqld to start, you can try to make a
+   trace file to find the problem by using the --debug option.
+   See Section 24.4.3, "The DBUG Package."
 
 2.10.2 Securing the Initial MySQL Accounts
 
    Part of the MySQL installation process is to set up the mysql
    database that contains the grant tables:
 
-     * Windows distributions contain preinitialized grant tables.
+     * Windows distributions contain preinitialized grant
+       tables.
 
      * On Unix, the mysql_install_db program populates the grant
-       tables. Some installation methods run this program for you.
-       Others require that you execute it manually. For details, see
-       Section 2.10.1, "Postinstallation Procedures for Unix-like
-       Systems."
-
-   The mysql.user grant table defines the initial MySQL user accounts
-   and their access privileges:
-
-     * Some accounts have the user name root. These are superuser
-       accounts that have all privileges and can do anything. The
-       initial root account passwords are empty, so anyone can
-       connect to the MySQL server as root without a password and be
-       granted all privileges.
+       tables. Some installation methods run this program for
+       you. Others require that you execute it manually. For
+       details, see Section 2.10.1, "Postinstallation Procedures
+       for Unix-like Systems."
+
+   The mysql.user grant table defines the initial MySQL user
+   accounts and their access privileges:
+
+     * Some accounts have the user name root. These are
+       superuser accounts that have all privileges and can do
+       anything. The initial root account passwords are empty,
+       so anyone can connect to the MySQL server as root without
+       a password and be granted all privileges.
 
           + On Windows, root accounts are created that permit
-            connections from the local host only. Connections can be
-            made by specifying the host name localhost, the IP
-            address 127.0.0.1, or the IPv6 address ::1. If the user
-            selects the Enable root access from remote machines
-            option during installation, the Windows installer creates
-            another root account that permits connections from any
-            host.
-
-          + On Unix, each root account permits connections from the
-            local host. Connections can be made by specifying the
-            host name localhost, the IP address 127.0.0.1, the IPv6
-            address ::1, or the actual host name or IP address.
-       An attempt to connect to the host 127.0.0.1 normally resolves
-       to the localhost account. However, this fails if the server is
-       run with the --skip-name-resolve option, so the 127.0.0.1
-       account is useful in that case. The ::1 account is used for
-       IPv6 connections.
-
-     * Some accounts are for anonymous users. These have an empty
-       user name. The anonymous accounts have no password, so anyone
-       can use them to connect to the MySQL server.
-
-          + On Windows, there is one anonymous account that permits
-            connections from the local host. Connections can be made
-            by specifying a host name of localhost.
-
-          + On Unix, each anonymous account permits connections from
-            the local host. Connections can be made by specifying a
-            host name of localhost for one of the accounts, or the
-            actual host name or IP address for the other.
-
-   To display which accounts exist in the mysql.user table and check
-   whether their passwords are empty, use the following statement:
+            connections from the local host only. Connections
+            can be made by specifying the host name localhost,
+            the IP address 127.0.0.1, or the IPv6 address ::1.
+            If the user selects the Enable root access from
+            remote machines option during installation, the
+            Windows installer creates another root account that
+            permits connections from any host.
+
+          + On Unix, each root account permits connections from
+            the local host. Connections can be made by
+            specifying the host name localhost, the IP address
+            127.0.0.1, the IPv6 address ::1, or the actual host
+            name or IP address.
+       An attempt to connect to the host 127.0.0.1 normally
+       resolves to the localhost account. However, this fails if
+       the server is run with the --skip-name-resolve option, so
+       the 127.0.0.1 account is useful in that case. The ::1
+       account is used for IPv6 connections.
+
+     * Some accounts are for anonymous users. These have an
+       empty user name. The anonymous accounts have no password,
+       so anyone can use them to connect to the MySQL server.
+
+          + On Windows, there is one anonymous account that
+            permits connections from the local host. Connections
+            can be made by specifying a host name of localhost.
+
+          + On Unix, each anonymous account permits connections
+            from the local host. Connections can be made by
+            specifying a host name of localhost for one of the
+            accounts, or the actual host name or IP address for
+            the other.
+
+   To display which accounts exist in the mysql.user table and
+   check whether their passwords are empty, use the following
+   statement:
 mysql> SELECT User, Host, Password FROM mysql.user;
 +------+--------------------+----------+
 | User | Host               | Password |
@@ -7268,56 +8185,57 @@ mysql> SELECT User, Host, Password FROM
 +------+--------------------+----------+
 
    This output indicates that there are several root and
-   anonymous-user accounts, none of which have passwords. The output
-   might differ on your system, but the presence of accounts with
-   empty passwords means that your MySQL installation is unprotected
-   until you do something about it:
+   anonymous-user accounts, none of which have passwords. The
+   output might differ on your system, but the presence of
+   accounts with empty passwords means that your MySQL
+   installation is unprotected until you do something about it:
 
      * You should assign a password to each MySQL root account.
 
-     * If you want to prevent clients from connecting as anonymous
-       users without a password, you should either assign a password
-       to each anonymous account or else remove the accounts.
+     * If you want to prevent clients from connecting as
+       anonymous users without a password, you should either
+       assign a password to each anonymous account or else
+       remove the accounts.
 
    In addition, the mysql.db table contains rows that permit all
    accounts to access the test database and other databases with
-   names that start with test_. This is true even for accounts that
-   otherwise have no special privileges such as the default anonymous
-   accounts. This is convenient for testing but inadvisable on
-   production servers. Administrators who want database access
-   restricted only to accounts that have permissions granted
-   explicitly for that purpose should remove these mysql.db table
-   rows.
-
-   The following instructions describe how to set up passwords for
-   the initial MySQL accounts, first for the root accounts, then for
-   the anonymous accounts. The instructions also cover how to remove
-   the anonymous accounts, should you prefer not to permit anonymous
-   access at all, and describe how to remove permissive access to
-   test databases. Replace newpwd in the examples with the password
-   that you want to use. Replace host_name with the name of the
-   server host. You can determine this name from the output of the
-   preceding SELECT statement. For the output shown, host_name is
-   myhost.example.com.
-   Note
-
-   For additional information about setting passwords, see Section
-   6.3.5, "Assigning Account Passwords." If you forget your root
-   password after setting it, see Section B.5.4.1, "How to Reset the
-   Root Password."
+   names that start with test_. This is true even for accounts
+   that otherwise have no special privileges such as the default
+   anonymous accounts. This is convenient for testing but
+   inadvisable on production servers. Administrators who want
+   database access restricted only to accounts that have
+   permissions granted explicitly for that purpose should remove
+   these mysql.db table rows.
+
+   The following instructions describe how to set up passwords
+   for the initial MySQL accounts, first for the root accounts,
+   then for the anonymous accounts. The instructions also cover
+   how to remove the anonymous accounts, should you prefer not
+   to permit anonymous access at all, and describe how to remove
+   permissive access to test databases. Replace newpwd in the
+   examples with the password that you want to use. Replace
+   host_name with the name of the server host. You can determine
+   this name from the output of the preceding SELECT statement.
+   For the output shown, host_name is myhost.example.com.
+   Note
+
+   For additional information about setting passwords, see
+   Section 6.3.5, "Assigning Account Passwords." If you forget
+   your root password after setting it, see Section B.5.4.1,
+   "How to Reset the Root Password."
 
    You might want to defer setting the passwords until later, to
-   avoid the need to specify them while you perform additional setup
-   or testing. However, be sure to set them before using your
-   installation for production purposes.
+   avoid the need to specify them while you perform additional
+   setup or testing. However, be sure to set them before using
+   your installation for production purposes.
 
-   To set up additional accounts, see Section 6.3.2, "Adding User
-   Accounts."
+   To set up additional accounts, see Section 6.3.2, "Adding
+   User Accounts."
 
 Assigning root Account Passwords
 
-   The root account passwords can be set several ways. The following
-   discussion demonstrates three methods:
+   The root account passwords can be set several ways. The
+   following discussion demonstrates three methods:
 
      * Use the SET PASSWORD statement
 
@@ -7325,10 +8243,10 @@ Assigning root Account Passwords
 
      * Use the mysqladmin command-line client program
 
-   To assign passwords using SET PASSWORD, connect to the server as
-   root and issue a SET PASSWORD statement for each root account
-   listed in the mysql.user table. Be sure to encrypt the password
-   using the PASSWORD() function.
+   To assign passwords using SET PASSWORD, connect to the server
+   as root and issue a SET PASSWORD statement for each root
+   account listed in the mysql.user table. Be sure to encrypt
+   the password using the PASSWORD() function.
 
    For Windows, do this:
 shell> mysql -u root
@@ -7337,8 +8255,8 @@ mysql> SET PASSWORD FOR 'root'@'127.0.0.
 mysql> SET PASSWORD FOR 'root'@'::1' = PASSWORD('newpwd');
 mysql> SET PASSWORD FOR 'root'@'%' = PASSWORD('newpwd');
 
-   The last statement is unnecessary if the mysql.user table has no
-   root account with a host value of %.
+   The last statement is unnecessary if the mysql.user table has
+   no root account with a host value of %.
 
    For Unix, do this:
 shell> mysql -u root
@@ -7347,49 +8265,50 @@ mysql> SET PASSWORD FOR 'root'@'127.0.0.
 mysql> SET PASSWORD FOR 'root'@'::1' = PASSWORD('newpwd');
 mysql> SET PASSWORD FOR 'root'@'host_name' = PASSWORD('newpwd');
 
-   You can also use a single statement that assigns a password to all
-   root accounts by using UPDATE to modify the mysql.user table
-   directly. This method works on any platform:
+   You can also use a single statement that assigns a password
+   to all root accounts by using UPDATE to modify the mysql.user
+   table directly. This method works on any platform:
 shell> mysql -u root
 mysql> UPDATE mysql.user SET Password = PASSWORD('newpwd')
     ->     WHERE User = 'root';
 mysql> FLUSH PRIVILEGES;
 
-   The FLUSH statement causes the server to reread the grant tables.
-   Without it, the password change remains unnoticed by the server
-   until you restart it.
+   The FLUSH statement causes the server to reread the grant
+   tables. Without it, the password change remains unnoticed by
+   the server until you restart it.
 
-   To assign passwords to the root accounts using mysqladmin, execute
-   the following commands:
+   To assign passwords to the root accounts using mysqladmin,
+   execute the following commands:
 shell> mysqladmin -u root password "newpwd"
 shell> mysqladmin -u root -h host_name password "newpwd"
 
    Those commands apply both to Windows and to Unix. The double
-   quotation marks around the password are not always necessary, but
-   you should use them if the password contains spaces or other
-   characters that are special to your command interpreter.
-
-   The mysqladmin method of setting the root account passwords does
-   not work for the 'root'@'127.0.0.1' or 'root'@'::1' account. Use
-   the SET PASSWORD method shown earlier.
+   quotation marks around the password are not always necessary,
+   but you should use them if the password contains spaces or
+   other characters that are special to your command
+   interpreter.
+
+   The mysqladmin method of setting the root account passwords
+   does not work for the 'root'@'127.0.0.1' or 'root'@'::1'
+   account. Use the SET PASSWORD method shown earlier.
 
    After the root passwords have been set, you must supply the
-   appropriate password whenever you connect as root to the server.
-   For example, to shut down the server with mysqladmin, use this
-   command:
+   appropriate password whenever you connect as root to the
+   server. For example, to shut down the server with mysqladmin,
+   use this command:
 shell> mysqladmin -u root -p shutdown
 Enter password: (enter root password here)
 
 Assigning Anonymous Account Passwords
 
    The mysql commands in the following instructions include a -p
-   option based on the assumption that you have set the root account
-   passwords using the preceding instructions and must specify that
-   password when connecting to the server.
+   option based on the assumption that you have set the root
+   account passwords using the preceding instructions and must
+   specify that password when connecting to the server.
 
    To assign passwords to the anonymous accounts, connect to the
-   server as root, then use either SET PASSWORD or UPDATE. Be sure to
-   encrypt the password using the PASSWORD() function.
+   server as root, then use either SET PASSWORD or UPDATE. Be
+   sure to encrypt the password using the PASSWORD() function.
 
    To use SET PASSWORD on Windows, do this:
 shell> mysql -u root -p
@@ -7402,17 +8321,17 @@ Enter password: (enter root password her
 mysql> SET PASSWORD FOR ''@'localhost' = PASSWORD('newpwd');
 mysql> SET PASSWORD FOR ''@'host_name' = PASSWORD('newpwd');
 
-   To set the anonymous-user account passwords with a single UPDATE
-   statement, do this (on any platform):
+   To set the anonymous-user account passwords with a single
+   UPDATE statement, do this (on any platform):
 shell> mysql -u root -p
 Enter password: (enter root password here)
 mysql> UPDATE mysql.user SET Password = PASSWORD('newpwd')
     ->     WHERE User = '';
 mysql> FLUSH PRIVILEGES;
 
-   The FLUSH statement causes the server to reread the grant tables.
-   Without it, the password change remains unnoticed by the server
-   until you restart it.
+   The FLUSH statement causes the server to reread the grant
+   tables. Without it, the password change remains unnoticed by
+   the server until you restart it.
 
 Removing Anonymous Accounts
 
@@ -7430,86 +8349,91 @@ mysql> DROP USER ''@'host_name';
 
 Securing Test Databases
 
-   By default, the mysql.db table contains rows that permit access by
-   any user to the test database and other databases with names that
-   start with test_. (These rows have an empty User column value,
-   which for access-checking purposes matches any user name.) This
-   means that such databases can be used even by accounts that
-   otherwise possess no privileges. If you want to remove any-user
-   access to test databases, do so as follows:
+   By default, the mysql.db table contains rows that permit
+   access by any user to the test database and other databases
+   with names that start with test_. (These rows have an empty
+   User column value, which for access-checking purposes matches
+   any user name.) This means that such databases can be used
+   even by accounts that otherwise possess no privileges. If you
+   want to remove any-user access to test databases, do so as
+   follows:
 shell> mysql -u root -p
 Enter password: (enter root password here)
 mysql> DELETE FROM mysql.db WHERE Db LIKE 'test%';
 mysql> FLUSH PRIVILEGES;
 
-   The FLUSH statement causes the server to reread the grant tables.
-   Without it, the privilege change remains unnoticed by the server
-   until you restart it.
-
-   With the preceding change, only users who have global database
-   privileges or privileges granted explicitly for the test database
-   can use it. However, if you do not want the database to exist at
-   all, drop it:
+   The FLUSH statement causes the server to reread the grant
+   tables. Without it, the privilege change remains unnoticed by
+   the server until you restart it.
+
+   With the preceding change, only users who have global
+   database privileges or privileges granted explicitly for the
+   test database can use it. However, if you do not want the
+   database to exist at all, drop it:
 mysql> DROP DATABASE test;
 
    Note
 
-   On Windows, you can also perform the process described in this
-   section using the Configuration Wizard (see Section 2.3.6.11, "The
-   Security Options Dialog"). On all platforms, the MySQL
-   distribution includes mysql_secure_installation, a command-line
-   utility that automates much of the process of securing a MySQL
-   installation.
+   On Windows, you can also perform the process described in
+   this section using the Configuration Wizard (see Section
+   2.3.6.11, "The Security Options Dialog"). On all platforms,
+   the MySQL distribution includes mysql_secure_installation, a
+   command-line utility that automates much of the process of
+   securing a MySQL installation.
 
 2.11 Upgrading or Downgrading MySQL
 
 2.11.1 Upgrading MySQL
 
-   As a general rule, to upgrade from one release series to another,
-   go to the next series rather than skipping a series. To upgrade
-   from a release series previous to MySQL 5.1, upgrade to each
-   successive release series in turn until you have reached MySQL
-   5.1, and then proceed with the upgrade to MySQL 5.5. For example,
-   if you currently are running MySQL 5.0 and wish to upgrade to a
-   newer series, upgrade to MySQL 5.1 first before upgrading to 5.5,
-   and so forth. For information on upgrading to MySQL 5.1, see the
-   MySQL 5.1 Reference Manual.
-
-   There is a special case for upgrading to MySQL 5.5, which is that
-   there was a short-lived MySQL 5.4 development series. This series
-   is no longer being worked on, but to accommodate users of both
-   series, this section includes one subsection for users upgrading
-   from MySQL 5.1 to 5.5 and another for users upgrading from MySQL
-   5.4 to 5.5.
+   As a general rule, to upgrade from one release series to
+   another, go to the next series rather than skipping a series.
+   To upgrade from a release series previous to MySQL 5.1,
+   upgrade to each successive release series in turn until you
+   have reached MySQL 5.1, and then proceed with the upgrade to
+   MySQL 5.5. For example, if you currently are running MySQL
+   5.0 and wish to upgrade to a newer series, upgrade to MySQL
+   5.1 first before upgrading to 5.5, and so forth. For
+   information on upgrading to MySQL 5.1, see the MySQL 5.1
+   Reference Manual.
+
+   There is a special case for upgrading to MySQL 5.5, which is
+   that there was a short-lived MySQL 5.4 development series.
+   This series is no longer being worked on, but to accommodate
+   users of both series, this section includes one subsection
+   for users upgrading from MySQL 5.1 to 5.5 and another for
+   users upgrading from MySQL 5.4 to 5.5.
 
-   To upgrade to MySQL 5.5, use the items in the following checklist
-   as a guide:
+   To upgrade to MySQL 5.5, use the items in the following
+   checklist as a guide:
 
      * Before any upgrade, back up your databases, including the
-       mysql database that contains the grant tables. See Section
-       7.2, "Database Backup Methods."
+       mysql database that contains the grant tables. See
+       Section 7.2, "Database Backup Methods."
 
-     * Read all the notes in Section 2.11.1.1, "Upgrading from MySQL
-       5.1 to 5.5," or Section 2.11.1.2, "Upgrading from MySQL 5.4 to
-       5.5," depending on whether you currently use MySQL 5.1 or 5.4.
-       These notes enable you to identify upgrade issues that apply
-       to your current MySQL installation. Some incompatibilities
-       discussed in that section require your attention before
-       upgrading. Others should be dealt with after upgrading.
+     * Read all the notes in Section 2.11.1.1, "Upgrading from
+       MySQL 5.1 to 5.5," or Section 2.11.1.2, "Upgrading from
+       MySQL 5.4 to 5.5," depending on whether you currently use
+       MySQL 5.1 or 5.4. These notes enable you to identify
+       upgrade issues that apply to your current MySQL
+       installation. Some incompatibilities discussed in that
+       section require your attention before upgrading. Others
+       should be dealt with after upgrading.
 
      * Read the Release Notes
-       (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) as well,
-       which provide information about features that are new in MySQL
-       5.5 or differ from those found in earlier MySQL releases.
-
-     * After upgrading to a new version of MySQL, run mysql_upgrade
-       (see Section 4.4.7, "mysql_upgrade --- Check and Upgrade MySQL
-       Tables"). This program checks your tables, and attempts to
-       repair them if necessary. It also updates your grant tables to
-       make sure that they have the current structure so that you can
-       take advantage of any new capabilities. (Some releases of
-       MySQL introduce changes to the structure of the grant tables
-       to add new privileges or features.)
+       (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) as
+       well, which provide information about features that are
+       new in MySQL 5.5 or differ from those found in earlier
+       MySQL releases.
+
+     * After upgrading to a new version of MySQL, run
+       mysql_upgrade (see Section 4.4.7, "mysql_upgrade ---
+       Check and Upgrade MySQL Tables"). This program checks
+       your tables, and attempts to repair them if necessary. It
+       also updates your grant tables to make sure that they
+       have the current structure so that you can take advantage
+       of any new capabilities. (Some releases of MySQL
+       introduce changes to the structure of the grant tables to
+       add new privileges or features.)
        mysql_upgrade does not upgrade the contents of the help
        tables. For upgrade instructions, see Section 5.1.10,
        "Server-Side Help."
@@ -7521,153 +8445,166 @@ mysql> DROP DATABASE test;
        Replication Setup," for information on upgrading your
        replication setup.
 
-     * If you use InnoDB, consider setting innodb_fast_shutdown to 0
-       before shutting down and upgrading your server. When you set
-       innodb_fast_shutdown to 0, InnoDB does a slow shutdown, a full
-       purge and an insert buffer merge before shutting down, which
-       ensures that all data files are fully prepared in case the
-       upgrade process modifies the file format.
+     * If you use InnoDB, consider setting innodb_fast_shutdown
+       to 0 before shutting down and upgrading your server. When
+       you set innodb_fast_shutdown to 0, InnoDB does a slow
+       shutdown, a full purge and an insert buffer merge before
+       shutting down, which ensures that all data files are
+       fully prepared in case the upgrade process modifies the
+       file format.
 
      * If you upgrade an installation originally produced by
-       installing multiple RPM packages, it is best to upgrade all
-       the packages, not just some. For example, if you previously
-       installed the server and client RPMs, do not upgrade just the
-       server RPM.
-
-     * If you have created a user-defined function (UDF) with a given
-       name and upgrade MySQL to a version that implements a new
-       built-in function with the same name, the UDF becomes
-       inaccessible. To correct this, use DROP FUNCTION to drop the
-       UDF, and then use CREATE FUNCTION to re-create the UDF with a
-       different nonconflicting name. The same is true if the new
-       version of MySQL implements a built-in function with the same
-       name as an existing stored function. See Section 9.2.4,
-       "Function Name Parsing and Resolution," for the rules
-       describing how the server interprets references to different
-       kinds of functions.
-
-   For upgrades between versions of a MySQL release series that has
-   reached General Availability status, you can move the MySQL format
-   files and data files between different versions on systems with
-   the same architecture. For upgrades to a version of a MySQL
-   release series that is in development status, that is not
-   necessarily true. Use of development releases is at your own risk.
+       installing multiple RPM packages, it is best to upgrade
+       all the packages, not just some. For example, if you
+       previously installed the server and client RPMs, do not
+       upgrade just the server RPM.
+
+     * If you have created a user-defined function (UDF) with a
+       given name and upgrade MySQL to a version that implements
+       a new built-in function with the same name, the UDF
+       becomes inaccessible. To correct this, use DROP FUNCTION
+       to drop the UDF, and then use CREATE FUNCTION to
+       re-create the UDF with a different nonconflicting name.
+       The same is true if the new version of MySQL implements a
+       built-in function with the same name as an existing
+       stored function. See Section 9.2.4, "Function Name
+       Parsing and Resolution," for the rules describing how the
+       server interprets references to different kinds of
+       functions.
+
+   For upgrades between versions of a MySQL release series that
+   has reached General Availability status, you can move the
+   MySQL format files and data files between different versions
+   on systems with the same architecture. For upgrades to a
+   version of a MySQL release series that is in development
+   status, that is not necessarily true. Use of development
+   releases is at your own risk.
 
    If you are cautious about using new versions, you can always
-   rename your old mysqld before installing a newer one. For example,
-   if you are using a version of MySQL 5.1 and want to upgrade to
-   5.5, rename your current server from mysqld to mysqld-5.1. If your
-   new mysqld then does something unexpected, you can simply shut it
-   down and restart with your old mysqld.
-
-   If problems occur, such as that the new mysqld server does not
-   start or that you cannot connect without a password, verify that
-   you do not have an old my.cnf file from your previous
-   installation. You can check this with the --print-defaults option
-   (for example, mysqld --print-defaults). If this command displays
-   anything other than the program name, you have an active my.cnf
-   file that affects server or client operation.
-
-   If, after an upgrade, you experience problems with compiled client
-   programs, such as Commands out of sync or unexpected core dumps,
-   you probably have used old header or library files when compiling
-   your programs. In this case, you should check the date for your
-   mysql.h file and libmysqlclient.a library to verify that they are
-   from the new MySQL distribution. If not, recompile your programs
-   with the new headers and libraries. Recompilation might also be
-   necessary for programs compiled against the shared client library
-   if the library major version number has changed (for example from
-   libmysqlclient.so.15 to libmysqlclient.so.16.
-
-   If your MySQL installation contains a large amount of data that
-   might take a long time to convert after an in-place upgrade, you
-   might find it useful to create a "dummy" database instance for
-   assessing what conversions might be needed and the work involved
-   to perform them. Make a copy of your MySQL instance that contains
-   a full copy of the mysql database, plus all other databases
-   without data. Run your upgrade procedure on this dummy instance to
-   see what actions might be needed so that you can better evaluate
-   the work involved when performing actual data conversion on your
+   rename your old mysqld before installing a newer one. For
+   example, if you are using a version of MySQL 5.1 and want to
+   upgrade to 5.5, rename your current server from mysqld to
+   mysqld-5.1. If your new mysqld then does something
+   unexpected, you can simply shut it down and restart with your
+   old mysqld.
+
+   If problems occur, such as that the new mysqld server does
+   not start or that you cannot connect without a password,
+   verify that you do not have an old my.cnf file from your
+   previous installation. You can check this with the
+   --print-defaults option (for example, mysqld
+   --print-defaults). If this command displays anything other
+   than the program name, you have an active my.cnf file that
+   affects server or client operation.
+
+   If, after an upgrade, you experience problems with compiled
+   client programs, such as Commands out of sync or unexpected
+   core dumps, you probably have used old header or library
+   files when compiling your programs. In this case, you should
+   check the date for your mysql.h file and libmysqlclient.a
+   library to verify that they are from the new MySQL
+   distribution. If not, recompile your programs with the new
+   headers and libraries. Recompilation might also be necessary
+   for programs compiled against the shared client library if
+   the library major version number has changed (for example
+   from libmysqlclient.so.15 to libmysqlclient.so.16.
+
+   If your MySQL installation contains a large amount of data
+   that might take a long time to convert after an in-place
+   upgrade, you might find it useful to create a "dummy"
+   database instance for assessing what conversions might be
+   needed and the work involved to perform them. Make a copy of
+   your MySQL instance that contains a full copy of the mysql
+   database, plus all other databases without data. Run your
+   upgrade procedure on this dummy instance to see what actions
+   might be needed so that you can better evaluate the work
+   involved when performing actual data conversion on your
    original database instance.
 
-   It is a good idea to rebuild and reinstall the Perl DBD::mysql
-   module whenever you install a new release of MySQL. The same
-   applies to other MySQL interfaces as well, such as PHP mysql
-   extensions and the Python MySQLdb module.
+   It is a good idea to rebuild and reinstall the Perl
+   DBD::mysql module whenever you install a new release of
+   MySQL. The same applies to other MySQL interfaces as well,
+   such as PHP mysql extensions and the Python MySQLdb module.
 
 2.11.1.1 Upgrading from MySQL 5.1 to 5.5
 
    Note
 
-   It is good practice to back up your data before installing any new
-   version of software. Although MySQL works very hard to ensure a
-   high level of quality, you should protect your data by making a
-   backup.
-
-   To upgrade to 5.5 from any previous version, MySQL recommends that
-   you dump your tables with mysqldump before upgrading and reload
-   the dump file after upgrading. Use the --all-databases option to
-   include all databases in the dump. If your databases include
-   stored programs, use the --routines and --events options as well.
+   It is good practice to back up your data before installing
+   any new version of software. Although MySQL works very hard
+   to ensure a high level of quality, you should protect your
+   data by making a backup.
+
+   To upgrade to 5.5 from any previous version, MySQL recommends
+   that you dump your tables with mysqldump before upgrading and
+   reload the dump file after upgrading. Use the --all-databases
+   option to include all databases in the dump. If your
+   databases include stored programs, use the --routines and
+   --events options as well.
 
-   In general, you should do the following when upgrading from MySQL
-   5.1 to 5.5:
+   In general, you should do the following when upgrading from
+   MySQL 5.1 to 5.5:
 
-     * Read all the items in these sections to see whether any of
-       them might affect your applications:
+     * Read all the items in these sections to see whether any
+       of them might affect your applications:
 
-          + Section 2.11.1, "Upgrading MySQL," has general update
-            information.
+          + Section 2.11.1, "Upgrading MySQL," has general
+            update information.
 
           + The items in the change lists provided later in this
-            section enable you to identify upgrade issues that apply
-            to your current MySQL installation. Some
-            incompatibilities discussed there require your attention
-            before upgrading. Others should be dealt with after
-            upgrading.
+            section enable you to identify upgrade issues that
+            apply to your current MySQL installation. Some
+            incompatibilities discussed there require your
+            attention before upgrading. Others should be dealt
+            with after upgrading.
 
           + The MySQL 5.5 Release Notes
             (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/)
-            describe significant new features you can use in 5.5 or
-            that differ from those found in earlier MySQL releases.
-            Some of these changes may result in incompatibilities.
-       Note particularly any changes that are marked Known issue or
-       Incompatible change. These incompatibilities with earlier
-       versions of MySQL may require your attention before you
-       upgrade. Our aim is to avoid these changes, but occasionally
-       they are necessary to correct problems that would be worse
-       than an incompatibility between releases. If any upgrade issue
-       applicable to your installation involves an incompatibility
-       that requires special handling, follow the instructions given
-       in the incompatibility description. Sometimes this involves
-       dumping and reloading tables, or use of a statement such as
-       CHECK TABLE or REPAIR TABLE.
+            describe significant new features you can use in 5.5
+            or that differ from those found in earlier MySQL
+            releases. Some of these changes may result in
+            incompatibilities.
+       Note particularly any changes that are marked Known issue
+       or Incompatible change. These incompatibilities with
+       earlier versions of MySQL may require your attention
+       before you upgrade. Our aim is to avoid these changes,
+       but occasionally they are necessary to correct problems
+       that would be worse than an incompatibility between
+       releases. If any upgrade issue applicable to your
+       installation involves an incompatibility that requires
+       special handling, follow the instructions given in the
+       incompatibility description. Sometimes this involves
+       dumping and reloading tables, or use of a statement such
+       as CHECK TABLE or REPAIR TABLE.
        For dump and reload instructions, see Section 2.11.4,
-       "Rebuilding or Repairing Tables or Indexes." Any procedure
-       that involves REPAIR TABLE with the USE_FRM option must be
-       done before upgrading. Use of this statement with a version of
-       MySQL different from the one used to create the table (that
-       is, using it after upgrading) may damage the table. See
-       Section 13.7.2.5, "REPAIR TABLE Syntax."
-
-     * Before upgrading to a new version of MySQL, Section 2.11.3,
-       "Checking Whether Tables or Indexes Must Be Rebuilt," to see
-       whether changes to table formats or to character sets or
-       collations were made between your current version of MySQL and
-       the version to which you are upgrading. If so and these
-       changes result in an incompatibility between MySQL versions,
-       you will need to upgrade the affected tables using the
-       instructions in Section 2.11.4, "Rebuilding or Repairing
-       Tables or Indexes."
-
-     * After upgrading to a new version of MySQL, run mysql_upgrade
-       (see Section 4.4.7, "mysql_upgrade --- Check and Upgrade MySQL
-       Tables"). This program checks your tables, and attempts to
-       repair them if necessary. It also updates your grant tables to
-       make sure that they have the current structure so that you can
-       take advantage of any new capabilities. (Some releases of
-       MySQL introduce changes to the structure of the grant tables
-       to add new privileges or features.)
+       "Rebuilding or Repairing Tables or Indexes." Any
+       procedure that involves REPAIR TABLE with the USE_FRM
+       option must be done before upgrading. Use of this
+       statement with a version of MySQL different from the one
+       used to create the table (that is, using it after
+       upgrading) may damage the table. See Section 13.7.2.5,
+       "REPAIR TABLE Syntax."
+
+     * Before upgrading to a new version of MySQL, Section
+       2.11.3, "Checking Whether Tables or Indexes Must Be
+       Rebuilt," to see whether changes to table formats or to
+       character sets or collations were made between your
+       current version of MySQL and the version to which you are
+       upgrading. If so and these changes result in an
+       incompatibility between MySQL versions, you will need to
+       upgrade the affected tables using the instructions in
+       Section 2.11.4, "Rebuilding or Repairing Tables or
+       Indexes."
+
+     * After upgrading to a new version of MySQL, run
+       mysql_upgrade (see Section 4.4.7, "mysql_upgrade ---
+       Check and Upgrade MySQL Tables"). This program checks
+       your tables, and attempts to repair them if necessary. It
+       also updates your grant tables to make sure that they
+       have the current structure so that you can take advantage
+       of any new capabilities. (Some releases of MySQL
+       introduce changes to the structure of the grant tables to
+       add new privileges or features.)
        mysql_upgrade does not upgrade the contents of the help
        tables. For upgrade instructions, see Section 5.1.10,
        "Server-Side Help."
@@ -7679,401 +8616,446 @@ mysql> DROP DATABASE test;
        Replication Setup," for information on upgrading your
        replication setup.
 
-   If your MySQL installation contains a large amount of data that
-   might take a long time to convert after an in-place upgrade, you
-   might find it useful to create a "dummy" database instance for
-   assessing what conversions might be needed and the work involved
-   to perform them. Make a copy of your MySQL instance that contains
-   a full copy of the mysql database, plus all other databases
-   without data. Run your upgrade procedure on this dummy instance to
-   see what actions might be needed so that you can better evaluate
-   the work involved when performing actual data conversion on your
+   If your MySQL installation contains a large amount of data
+   that might take a long time to convert after an in-place
+   upgrade, you might find it useful to create a "dummy"
+   database instance for assessing what conversions might be
+   needed and the work involved to perform them. Make a copy of
+   your MySQL instance that contains a full copy of the mysql
+   database, plus all other databases without data. Run your
+   upgrade procedure on this dummy instance to see what actions
+   might be needed so that you can better evaluate the work
+   involved when performing actual data conversion on your
    original database instance.
 
-   The following lists describe changes that may affect applications
-   and that you should watch out for when upgrading from MySQL 5.1 to
-   5.5.
+   The following lists describe changes that may affect
+   applications and that you should watch out for when upgrading
+   from MySQL 5.1 to 5.5.
 
 Configuration Changes
 
 
-     * Incompatible change: The InnoDB Plugin is included in MySQL
-       5.5 releases. It becomes the built-in version of InnoDB in
-       MySQL Server, replacing the version previously included as the
-       built-in InnoDB engine. InnoDB Plugin is also available in
-       MySQL 5.1 as of 5.1.38, but it is an optional storage engine
-       that must be enabled explicitly using two server options:
+     * Incompatible change: The InnoDB Plugin is included in
+       MySQL 5.5 releases. It becomes the built-in version of
+       InnoDB in MySQL Server, replacing the version previously
+       included as the built-in InnoDB engine. InnoDB Plugin is
+       also available in MySQL 5.1 as of 5.1.38, but it is an
+       optional storage engine that must be enabled explicitly
+       using two server options:
 [mysqld]
 ignore-builtin-innodb
 plugin-load=innodb=ha_innodb_plugin.so
-       If you were using InnoDB Plugin in MySQL 5.1 by means of those
-       options, you must remove them after an upgrade to 5.5 or the
-       server will fail to start.
+
+       If you were using InnoDB Plugin in MySQL 5.1 by means of
+       those options, you must remove them after an upgrade to
+       5.5 or the server will fail to start.
        In addition, in InnoDB Plugin, the innodb_file_io_threads
        system variable has been removed and replaced with
-       innodb_read_io_threads and innodb_write_io_threads. If you
-       upgrade from MySQL 5.1 to MySQL 5.5 and previously explicitly
-       set innodb_file_io_threads at server startup, you must change
-       your configuration. Either remove any reference to
-       innodb_file_io_threads or replace it with references to
-       innodb_read_io_threads and innodb_write_io_threads.
+       innodb_read_io_threads and innodb_write_io_threads. If
+       you upgrade from MySQL 5.1 to MySQL 5.5 and previously
+       explicitly set innodb_file_io_threads at server startup,
+       you must change your configuration. Either remove any
+       reference to innodb_file_io_threads or replace it with
+       references to innodb_read_io_threads and
+       innodb_write_io_threads.
 
      * Incompatible change: In MySQL 5.5, the server includes a
-       plugin services interface that complements the plugin API. The
-       services interface enables server functionality to be exposed
-       as a "service" that plugins can access through a function-call
-       interface. The libmysqlservices library provides access to the
-       available services and dynamic plugins now must be linked
-       against this library (use the -lmysqlservices flag). For an
-       example showing how to configure for CMake, see Section
-       24.2.5, "MySQL Services for Plugins."
+       plugin services interface that complements the plugin
+       API. The services interface enables server functionality
+       to be exposed as a "service" that plugins can access
+       through a function-call interface. The libmysqlservices
+       library provides access to the available services and
+       dynamic plugins now must be linked against this library
+       (use the -lmysqlservices flag). For an example showing
+       how to configure for CMake, see Section 24.2.5, "MySQL
+       Services for Plugins."
 
 Server Changes
 
 
-     * Known issue: As of MySQL 5.5.32, for new installations, the
-       url columns in the mysql database help tables are now created
-       as type TEXT to accommodate longer URLs. For upgrades,
-       mysql_upgrade does not update the columns. Modify them
-       manually using these statements:
+     * On Linux systems, the libaio library may be needed.
+       Install it first, if it is not already present on your
+       system.
+
+     * Known issue: As of MySQL 5.5.32, for new installations,
+       the url columns in the mysql database help tables are now
+       created as type TEXT to accommodate longer URLs. For
+       upgrades, mysql_upgrade does not update the columns.
+       Modify them manually using these statements:
 ALTER TABLE mysql.help_category MODIFY url TEXT NOT NULL;
 ALTER TABLE mysql.help_topic MODIFY url TEXT NOT NULL;
 
-     * Incompatible change: As of MySQL 5.5.3, due to work done for
-       Bug #989, FLUSH TABLES is not permitted when there is an
-       active LOCK TABLES ... READ. To provide a workaround for this
-       restriction, FLUSH TABLES has a new variant, FLUSH TABLES
-       tbl_list WITH READ LOCK, that enables tables to be flushed and
-       locked in a single operation. As a result of this change,
-       applications that previously used this statement sequence to
-       lock and flush tables will fail:
+
+     * Incompatible change: As of MySQL 5.5.3, due to work done
+       for Bug #989, FLUSH TABLES is not permitted when there is
+       an active LOCK TABLES ... READ. To provide a workaround
+       for this restriction, FLUSH TABLES has a new variant,
+       FLUSH TABLES tbl_list WITH READ LOCK, that enables tables
+       to be flushed and locked in a single operation. As a
+       result of this change, applications that previously used
+       this statement sequence to lock and flush tables will
+       fail:
 LOCK TABLES tbl_list READ;
 FLUSH TABLES tbl_list;
+
        Such applications should now use this statement instead:
 FLUSH TABLES tbl_list WITH READ LOCK;
 
-     * Incompatible change: As of MySQL 5.5.7, the server requires
-       that a new grant table, proxies_priv, be present in the mysql
-       database. If you are upgrading to 5.5.7 from a previous MySQL
-       release rather than performing a new installation, the server
-       will find that this table is missing and exit during startup
-       with the following message:
+
+     * Incompatible change: As of MySQL 5.5.7, the server
+       requires that a new grant table, proxies_priv, be present
+       in the mysql database. If you are upgrading to 5.5.7 from
+       a previous MySQL release rather than performing a new
+       installation, the server will find that this table is
+       missing and exit during startup with the following
+       message:
 Table 'mysql.proxies_priv' doesn't exist
-       To create the proxies_priv table, start the server with the
-       --skip-grant-tables option to cause it to skip the normal
-       grant table checks, then run mysql_upgrade. For example:
+
+       To create the proxies_priv table, start the server with
+       the --skip-grant-tables option to cause it to skip the
+       normal grant table checks, then run mysql_upgrade. For
+       example:
 shell> mysqld --skip-grant-tables &
 shell> mysql_upgrade
+
        Then stop the server and restart it normally.
-       You can specify other options on the mysqld command line if
-       necessary. Alternatively, if your installation is configured
-       so that the server normally reads options from an option file,
-       use the --defaults-file option to specify the file (enter each
-       command on a single line):
+       You can specify other options on the mysqld command line
+       if necessary. Alternatively, if your installation is
+       configured so that the server normally reads options from
+       an option file, use the --defaults-file option to specify
+       the file (enter each command on a single line):
 shell> mysqld --defaults-file=/usr/local/mysql/etc/my.cnf
          --skip-grant-tables &
 shell> mysql_upgrade
+
        With the --skip-grant-tables option, the server does no
-       password or privilege checking, so any client can connect and
-       effectively have all privileges. For additional security, use
-       the --skip-networking option as well to prevent remote clients
-       from connecting.
+       password or privilege checking, so any client can connect
+       and effectively have all privileges. For additional
+       security, use the --skip-networking option as well to
+       prevent remote clients from connecting.
        Note
        This problem is fixed in MySQL 5.5.8; the server treats a
-       missing proxies_priv table as equivalent to an empty table.
-       However, after starting the server, you should still run
-       mysql_upgrade to create the table.
-
-     * Incompatible change: As of MySQL 5.5.7, InnoDB always uses the
-       fast truncation technique, equivalent to DROP TABLE and CREATE
-       TABLE. It no longer performs a row-by-row delete for tables
-       with parent-child foreign key relationships. TRUNCATE TABLE
-       returns an error for such tables. Modify your SQL to issue
-       DELETE FROM table_name for such tables instead.
-
-     * Incompatible change: Prior to MySQL 5.5.7, if you flushed the
-       logs using FLUSH LOGS or mysqladmin flush-logs and mysqld was
-       writing the error log to a file (for example, if it was
-       started with the --log-error option), it renames the current
-       log file with the suffix -old, then created a new empty log
-       file. This had the problem that a second log-flushing
-       operation thus caused the original error log file to be lost
-       unless you saved it under a different name. For example, you
-       could use the following commands to save the file:
+       missing proxies_priv table as equivalent to an empty
+       table. However, after starting the server, you should
+       still run mysql_upgrade to create the table.
+
+     * Incompatible change: As of MySQL 5.5.7, InnoDB always
+       uses the fast truncation technique, equivalent to DROP
+       TABLE and CREATE TABLE. It no longer performs a
+       row-by-row delete for tables with parent-child foreign
+       key relationships. TRUNCATE TABLE returns an error for
+       such tables. Modify your SQL to issue DELETE FROM
+       table_name for such tables instead.
+
+     * Incompatible change: Prior to MySQL 5.5.7, if you flushed
+       the logs using FLUSH LOGS or mysqladmin flush-logs and
+       mysqld was writing the error log to a file (for example,
+       if it was started with the --log-error option), it
+       renames the current log file with the suffix -old, then
+       created a new empty log file. This had the problem that a
+       second log-flushing operation thus caused the original
+       error log file to be lost unless you saved it under a
+       different name. For example, you could use the following
+       commands to save the file:
 shell> mysqladmin flush-logs
 shell> mv host_name.err-old backup-directory
-       To avoid the preceding file-loss problem, no renaming occurs
-       as of MySQL 5.5.7; the server merely closes and reopens the
-       log file. To rename the file, you can do so manually before
-       flushing. Then flushing the logs reopens a new file with the
-       original file name. For example, you can rename the file and
-       create a new one using the following commands:
+
+       To avoid the preceding file-loss problem, no renaming
+       occurs as of MySQL 5.5.7; the server merely closes and
+       reopens the log file. To rename the file, you can do so
+       manually before flushing. Then flushing the logs reopens
+       a new file with the original file name. For example, you
+       can rename the file and create a new one using the
+       following commands:
 shell> mv host_name.err host_name.err-old
 shell> mysqladmin flush-logs
 shell> mv host_name.err-old backup-directory
 
-     * Incompatible change: As of MySQL 5.5.6, handling of CREATE
-       TABLE IF NOT EXISTS ... SELECT statements has been changed for
-       the case that the destination table already exists:
-
-          + Previously, for CREATE TABLE IF NOT EXISTS ... SELECT,
-            MySQL produced a warning that the table exists, but
-            inserted the rows and wrote the statement to the binary
-            log anyway. By contrast, CREATE TABLE ... SELECT (without
-            IF NOT EXISTS) failed with an error, but MySQL inserted
-            no rows and did not write the statement to the binary
-            log.
-
-          + MySQL now handles both statements the same way when the
-            destination table exists, in that neither statement
-            inserts rows or is written to the binary log. The
-            difference between them is that MySQL produces a warning
-            when IF NOT EXISTS is present and an error when it is
-            not.
+
+     * Incompatible change: As of MySQL 5.5.6, handling of
+       CREATE TABLE IF NOT EXISTS ... SELECT statements has been
+       changed for the case that the destination table already
+       exists:
+
+          + Previously, for CREATE TABLE IF NOT EXISTS ...
+            SELECT, MySQL produced a warning that the table
+            exists, but inserted the rows and wrote the
+            statement to the binary log anyway. By contrast,
+            CREATE TABLE ... SELECT (without IF NOT EXISTS)
+            failed with an error, but MySQL inserted no rows and
+            did not write the statement to the binary log.
+
+          + MySQL now handles both statements the same way when
+            the destination table exists, in that neither
+            statement inserts rows or is written to the binary
+            log. The difference between them is that MySQL
+            produces a warning when IF NOT EXISTS is present and
+            an error when it is not.
        This change in handling of IF NOT EXISTS results in an
-       incompatibility for statement-based replication from a MySQL
-       5.1 master with the original behavior and a MySQL 5.5 slave
-       with the new behavior. Suppose that CREATE TABLE IF NOT EXISTS
-       ... SELECT is executed on the master and the destination table
-       exists. The result is that rows are inserted on the master but
-       not on the slave. (Row-based replication does not have this
-       problem.)
+       incompatibility for statement-based replication from a
+       MySQL 5.1 master with the original behavior and a MySQL
+       5.5 slave with the new behavior. Suppose that CREATE
+       TABLE IF NOT EXISTS ... SELECT is executed on the master
+       and the destination table exists. The result is that rows
+       are inserted on the master but not on the slave.
+       (Row-based replication does not have this problem.)
        To address this issue, statement-based binary logging for
-       CREATE TABLE IF NOT EXISTS ... SELECT is changed in MySQL 5.1
-       as of 5.1.51:
+       CREATE TABLE IF NOT EXISTS ... SELECT is changed in MySQL
+       5.1 as of 5.1.51:
 
           + If the destination table does not exist, there is no
             change: The statement is logged as is.
 
-          + If the destination table does exist, the statement is
-            logged as the equivalent pair of CREATE TABLE IF NOT
-            EXISTS and INSERT ... SELECT statements. (If the SELECT
-            in the original statement is preceded by IGNORE or
-            REPLACE, the INSERT becomes INSERT IGNORE or REPLACE,
-            respectively.)
-       This change provides forward compatibility for statement-based
-       replication from MySQL 5.1 to 5.5 because when the destination
-       table exists, the rows will be inserted on both the master and
-       slave. To take advantage of this compatibility measure, the
-       5.1 server must be at least 5.1.51 and the 5.5 server must be
-       at least 5.5.6.
+          + If the destination table does exist, the statement
+            is logged as the equivalent pair of CREATE TABLE IF
+            NOT EXISTS and INSERT ... SELECT statements. (If the
+            SELECT in the original statement is preceded by
+            IGNORE or REPLACE, the INSERT becomes INSERT IGNORE
+            or REPLACE, respectively.)
+       This change provides forward compatibility for
+       statement-based replication from MySQL 5.1 to 5.5 because
+       when the destination table exists, the rows will be
+       inserted on both the master and slave. To take advantage
+       of this compatibility measure, the 5.1 server must be at
+       least 5.1.51 and the 5.5 server must be at least 5.5.6.
        To upgrade an existing 5.1-to-5.5 replication scenario,
-       upgrade the master first to 5.1.51 or higher. Note that this
-       differs from the usual replication upgrade advice of upgrading
-       the slave first.
+       upgrade the master first to 5.1.51 or higher. Note that
+       this differs from the usual replication upgrade advice of
+       upgrading the slave first.
        A workaround for applications that wish to achieve the
        original effect (rows inserted regardless of whether the
-       destination table exists) is to use CREATE TABLE IF NOT EXISTS
-       and INSERT ... SELECT statements rather than CREATE TABLE IF
-       NOT EXISTS ... SELECT statements.
-       Along with the change just described, the following related
-       change was made: Previously, if an existing view was named as
-       the destination table for CREATE TABLE IF NOT EXISTS ...
-       SELECT, rows were inserted into the underlying base table and
-       the statement was written to the binary log. As of MySQL
-       5.1.51 and 5.5.6, nothing is inserted or logged.
-
-     * Incompatible change: Prior to MySQL 5.5.6, if the server was
-       started with character_set_server set to utf16, it crashed
-       during full-text stopword initialization. Now the stopword
-       file is loaded and searched using latin1 if
-       character_set_server is ucs2, utf16, or utf32. If any table
-       was created with FULLTEXT indexes while the server character
-       set was ucs2, utf16, or utf32, it should be repaired using
-       this statement:
+       destination table exists) is to use CREATE TABLE IF NOT
+       EXISTS and INSERT ... SELECT statements rather than
+       CREATE TABLE IF NOT EXISTS ... SELECT statements.
+       Along with the change just described, the following
+       related change was made: Previously, if an existing view
+       was named as the destination table for CREATE TABLE IF
+       NOT EXISTS ... SELECT, rows were inserted into the
+       underlying base table and the statement was written to
+       the binary log. As of MySQL 5.1.51 and 5.5.6, nothing is
+       inserted or logged.
+
+     * Incompatible change: Prior to MySQL 5.5.6, if the server
+       was started with character_set_server set to utf16, it
+       crashed during full-text stopword initialization. Now the
+       stopword file is loaded and searched using latin1 if
+       character_set_server is ucs2, utf16, or utf32. If any
+       table was created with FULLTEXT indexes while the server
+       character set was ucs2, utf16, or utf32, it should be
+       repaired using this statement:
 REPAIR TABLE tbl_name QUICK;
 
-     * Incompatible change: As of MySQL 5.5.5, all numeric operators
-       and functions on integer, floating-point and DECIMAL values
-       throw an "out of range" error (ER_DATA_OUT_OF_RANGE) rather
-       than returning an incorrect value or NULL, when the result is
-       out of the supported range for the corresponding data type.
-       See Section 11.2.6, "Out-of-Range and Overflow Handling."
-
-     * Incompatible change: In very old versions of MySQL (prior to
-       4.1), the TIMESTAMP data type supported a display width, which
-       was silently ignored beginning with MySQL 4.1. This is
-       deprecated in MySQL 5.1, and removed altogether in MySQL 5.5.
-       These changes in behavior can lead to two problem scenarios
-       when trying to use TIMESTAMP(N) columns with a MySQL 5.5 or
-       later server:
+
+     * Incompatible change: As of MySQL 5.5.5, all numeric
+       operators and functions on integer, floating-point and
+       DECIMAL values throw an "out of range" error
+       (ER_DATA_OUT_OF_RANGE) rather than returning an incorrect
+       value or NULL, when the result is out of the supported
+       range for the corresponding data type. See Section
+       11.2.6, "Out-of-Range and Overflow Handling."
+
+     * Incompatible change: In very old versions of MySQL (prior
+       to 4.1), the TIMESTAMP data type supported a display
+       width, which was silently ignored beginning with MySQL
+       4.1. This is deprecated in MySQL 5.1, and removed
+       altogether in MySQL 5.5. These changes in behavior can
+       lead to two problem scenarios when trying to use
+       TIMESTAMP(N) columns with a MySQL 5.5 or later server:
 
           + When importing a dump file (for example, one created
-            using mysqldump) created in a MySQL 5.0 or earlier server
-            into a server from a newer release series, a CREATE TABLE
-            or ALTER TABLE statement containing TIMESTAMP(N) causes
-            the import to fail with a syntax error.
-            To fix this problem, edit the dump file in a text editor
-            to replace any instances of TIMESTAMP(N) with TIMESTAMP
-            prior to importing the file. Be sure to use a plain text
-            editor for this, and not a word processor; otherwise, the
-            result is almost certain to be unusable for importing
-            into the MySQL server.
-
-          + When trying replicate any CREATE TABLE or ALTER TABLE
-            statement containing TIMESTAMP(N) from a master MySQL
-            server that supports the TIMESTAMP(N) syntax to a MySQL
-            5.5.3 or newer slave, the statement causes replication to
-            fail. Similarly, when you try to restore from a binary
-            log written by a server that supports TIMESTAMP(N) to a
-            MySQL 5.5.3 or newer server, any CREATE TABLE or ALTER
-            TABLE statement containing TIMESTAMP(N) causes the backup
+            using mysqldump) created in a MySQL 5.0 or earlier
+            server into a server from a newer release series, a
+            CREATE TABLE or ALTER TABLE statement containing
+            TIMESTAMP(N) causes the import to fail with a syntax
+            error.
+            To fix this problem, edit the dump file in a text
+            editor to replace any instances of TIMESTAMP(N) with
+            TIMESTAMP prior to importing the file. Be sure to
+            use a plain text editor for this, and not a word
+            processor; otherwise, the result is almost certain
+            to be unusable for importing into the MySQL server.
+
+          + When trying replicate any CREATE TABLE or ALTER
+            TABLE statement containing TIMES