diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-25 21:40:15 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-25 21:40:15 +0100 |
| commit | 3fcd85485238130966aba277a3b64e717994da0d (patch) | |
| tree | 8c6d98090189e584770287bdbc3306c2c3883f3c /scripts/CMakeLists.txt | |
| parent | 46800354ab9659b46e227278926317e25fde7a7c (diff) | |
| download | mariadb-git-3fcd85485238130966aba277a3b64e717994da0d.tar.gz | |
Bug#51502: building with cmake creates an invalid mysqld_safe.
The problem was incorrect escaping used inside a strnig : in \"$MYSQLD\" was written as "\MYSQL\"
(backslash and quote characters transposed), when defining FIND_PROC variable for BSD or SysV
style "ps" command-
Additionally fixed obvious code duplication and random naming in CHECK_PID test.
Diffstat (limited to 'scripts/CMakeLists.txt')
| -rwxr-xr-x | scripts/CMakeLists.txt | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 92cba86fc8a..f838d27a241 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -103,9 +103,9 @@ ENDIF() IF(NOT FIND_PROC) # BSD style EXECUTE_PROCESS(COMMAND ps -uaxww OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result) - IF(result MATCHES 0) + IF(result MATCHES 0) SET( FIND_PROC - "ps -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- "\$MYSQLD\" | grep \" $PID \" > /dev/null") + "ps -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"$MYSQLD\" | grep \" $PID \" > /dev/null") ENDIF() ENDIF() @@ -113,20 +113,15 @@ IF(NOT FIND_PROC) # SysV style EXECUTE_PROCESS(COMMAND ps -ef OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result) IF(result MATCHES 0) - SET( FIND_PROC "ps -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- "\$MYSQLD\" | grep \" $PID \" > /dev/null") + SET( FIND_PROC "ps -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"$MYSQLD\" | grep \" $PID \" > /dev/null") ENDIF() ENDIF() -EXECUTE_PROCESS(COMMAND sh -c "kill -0 $$" OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result2) -IF(result3 MATCHES 0) +EXECUTE_PROCESS(COMMAND sh -c "kill -0 $$" OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result) +IF(result MATCHES 0) SET(CHECK_PID "kill -0 $PID > /dev/null 2> /dev/null") ELSE() - EXECUTE_PROCESS(COMMAND sh -c "kill -s 0 $$" OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result3) - IF(result4 MATCHES 0) - SET(CHECK_PID "kill -s 0 $PID > /dev/null 2> /dev/null") - ELSE() - SET(CHECK_PID "kill -s SIGCONT $PID > /dev/null 2> /dev/null") - ENDIF() + SET(CHECK_PID "kill -s SIGCONT $PID > /dev/null 2> /dev/null") ENDIF() ENDIF(UNIX) |