From: Joerg Bruehe Date: September 19 2012 2:51pm Subject: bzr push into mysql-5.6 branch (joerg.bruehe:4269 to 4270) List-Archive: http://lists.mysql.com/commits/144820 Message-Id: <20120919145159.540.4162.4270@trift-6core.fambruehe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4270 Joerg Bruehe 2012-09-19 Experimental only: revert to shell 'mysql_install_db' - NOT FOR REAL modified: scripts/CMakeLists.txt 4269 Joerg Bruehe 2012-09-19 'mysql_install_db': Align the Perl variant with the shell one. @ scripts/mysql_install_db.pl.in Omission: $resolveip was used but unset, and it lacked $extra_bindir as a path component. Difference to shell: "current_hostname" was never taken from "mysql_system_tables_data.sql", this filtering should only happen in a bootstrap run. modified: scripts/mysql_install_db.pl.in === modified file 'scripts/CMakeLists.txt' --- a/scripts/CMakeLists.txt 2012-09-11 18:10:34 +0000 +++ b/scripts/CMakeLists.txt 2012-09-19 14:51:09 +0000 @@ -203,7 +203,7 @@ IF(UNIX) ELSE() SET(EXT ".pl") ENDIF() -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.pl.in +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db${EXT} ESCAPE_QUOTES @ONLY) SET(DEST ${INSTALL_SCRIPTDIR}) No bundle (reason: useless for push emails).