bzr push into mysql-5.6-wl6055 branch (bjorn.munch:4379 to 4381)

[Bjorn Munch]

 4381 Bjorn Munch	2012-10-05
      Add ellipses to socket line too

    modified:
      support-files/CMakeLists.txt
 4380 Bjorn Munch	2012-10-05
      Bug #14725217 - PLEASE ADD SQL_MODE=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES TO...
        Added the line

    modified:
      support-files/my-default.cnf.sh
 4379 Bjorn Munch	2012-10-05
      WL 6055 review comments

    modified:
      scripts/mysql_install_db.pl.in
      support-files/CMakeLists.txt
      support-files/my-default.cnf.sh
=== modified file 'support-files/CMakeLists.txt'
--- a/support-files/CMakeLists.txt	2012-10-05 09:38:11 +0000
+++ b/support-files/CMakeLists.txt	2012-10-05 14:30:00 +0000
@@ -31,7 +31,7 @@ ELSE()
   SET(MYSQLD_USER "mysql")
   SET(ini_file_extension "cnf")
   SET(HOSTNAME "hostname")
-  SET(CNF_SOCKET_LINE "# socket")
+  SET(CNF_SOCKET_LINE "# socket = .....")
 ENDIF()
 
   SET(dictionary "${CMAKE_INSTALL_PREFIX}/${INSTALL_SHAREDIR}/dictionary.txt" )

=== modified file 'support-files/my-default.cnf.sh'
--- a/support-files/my-default.cnf.sh	2012-10-05 09:38:11 +0000
+++ b/support-files/my-default.cnf.sh	2012-10-05 14:28:44 +0000
@@ -27,3 +27,5 @@
 # join_buffer_size = 128M
 # sort_buffer_size = 2M
 # read_rnd_buffer_size = 2M 
+
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES 

No bundle (reason: useless for push emails).