Skip to content

Commit

Permalink
Bug #30338834 MYSQL-LOG-ROTATE IS EXECUTABLE BUT HAS EMPTY OR NO SHEBANG
Browse files Browse the repository at this point in the history
Rename support-files/mysql-log-rotate.sh => support-files/mysql-log-rotate.in
And remove execute bit when configuring/installing.

Rename support-files/mysqld_multi.server.sh => support-files/mysqld_multi.server
since it does not need CONFIGURE_FILE.

Remove execute bit from some .json data files.

Change-Id: I851131ffdd44fdc2fcd3171e13901e20bfdf6df6
  • Loading branch information
Tor Didriksen committed Sep 25, 2019
1 parent e7316a0 commit de14db4
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 16 deletions.
Empty file modified mysql-test/std_data/dd/sdi/upgrade/t_gen_stored.json
100755 → 100644
Empty file.
Empty file modified mysql-test/std_data/dd/sdi/upgrade_partition/sys_config.json
100755 → 100644
Empty file.
Empty file modified mysql-test/std_data/dd/sdi/upgrade_partition/t1#p#p0.json
100755 → 100644
Empty file.
38 changes: 23 additions & 15 deletions support-files/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,26 @@ ELSE()
SET (PIDOF "pgrep -d' ' -f")
ENDIF()

FOREACH(script
mysql.server
mysqld_multi.server
mysql-log-rotate
)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )

INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script}
DESTINATION ${INSTALL_SUPPORTFILESDIR} COMPONENT Server_Scripts
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
ENDFOREACH()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY)

CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-rotate.in
${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate @ONLY)

INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/mysql.server
COMPONENT Server_Scripts
DESTINATION ${INSTALL_SUPPORTFILESDIR}
)

INSTALL_SCRIPT(${CMAKE_CURRENT_SOURCE_DIR}/mysqld_multi.server
COMPONENT Server_Scripts
DESTINATION ${INSTALL_SUPPORTFILESDIR}
)

INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate
COMPONENT Server_Scripts
DESTINATION ${INSTALL_SUPPORTFILESDIR}
PERMISSIONS
OWNER_READ OWNER_WRITE
GROUP_READ WORLD_READ
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 2019, 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, version 2.0,
Expand Down
File renamed without changes.

0 comments on commit de14db4

Please sign in to comment.