diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /support-files | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 12 | ||||
| -rwxr-xr-x | support-files/build-tags | 7 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 5 |
3 files changed, 10 insertions, 14 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 67f6209ade2..75ebd4af3cd 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. -# Copyright (c) 2012, Monty Program Ab +# Copyright (c) 2006, 2014, Oracle and/or its affiliates. +# Copyright (c) 2012, 2014, SkySQL Ab. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -53,14 +53,8 @@ IF(UNIX) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) - - IF(script MATCHES ".ini") - SET(comp IniFiles) - ELSE() - SET(comp Server_Scripts) - ENDIF() INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${script} - DESTINATION ${inst_location} COMPONENT ${comp}) + DESTINATION ${inst_location} COMPONENT Server_Scripts) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) diff --git a/support-files/build-tags b/support-files/build-tags index a7fca4b42f4..44bd2a02593 100755 --- a/support-files/build-tags +++ b/support-files/build-tags @@ -1,12 +1,9 @@ #! /bin/sh rm -f TAGS -filter='\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$' +filter='\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.ic$\|errmsg-utf8\.txt$' list="find . -type f" bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned" -$list |grep $filter | grep -v gen-cpp |while read f; -do - etags -o TAGS --append $f -done +$list |grep $filter | xargs etags -o TAGS --append diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index caeec3f610f..56502ae0717 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -259,6 +259,11 @@ wait_for_ready () { if $bindir/mysqladmin ping >/dev/null 2>&1; then log_success_msg return 0 + elif kill -0 $! 2>/dev/null ; then + : # mysqld_safe is still running + else + # mysqld_safe is no longer running, abort the wait loop + break fi echo $echo_n ".$echo_c" |