Skip to content

Commit de14db4

Browse files
author
Tor Didriksen
committed
Bug #30338834 MYSQL-LOG-ROTATE IS EXECUTABLE BUT HAS EMPTY OR NO SHEBANG
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
1 parent e7316a0 commit de14db4

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

mysql-test/std_data/dd/sdi/upgrade/t_gen_stored.json

100755100644
File mode changed.

mysql-test/std_data/dd/sdi/upgrade_partition/sys_config.json

100755100644
File mode changed.

mysql-test/std_data/dd/sdi/upgrade_partition/t1#p#p0.json

100755100644
File mode changed.

support-files/CMakeLists.txt

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,26 @@ ELSE()
3939
SET (PIDOF "pgrep -d' ' -f")
4040
ENDIF()
4141

42-
FOREACH(script
43-
mysql.server
44-
mysqld_multi.server
45-
mysql-log-rotate
46-
)
47-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
48-
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
49-
50-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script}
51-
DESTINATION ${INSTALL_SUPPORTFILESDIR} COMPONENT Server_Scripts
52-
PERMISSIONS
53-
OWNER_READ OWNER_WRITE OWNER_EXECUTE
54-
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
55-
)
56-
ENDFOREACH()
42+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
43+
${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY)
44+
45+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-rotate.in
46+
${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate @ONLY)
47+
48+
INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/mysql.server
49+
COMPONENT Server_Scripts
50+
DESTINATION ${INSTALL_SUPPORTFILESDIR}
51+
)
52+
53+
INSTALL_SCRIPT(${CMAKE_CURRENT_SOURCE_DIR}/mysqld_multi.server
54+
COMPONENT Server_Scripts
55+
DESTINATION ${INSTALL_SUPPORTFILESDIR}
56+
)
57+
58+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate
59+
COMPONENT Server_Scripts
60+
DESTINATION ${INSTALL_SUPPORTFILESDIR}
61+
PERMISSIONS
62+
OWNER_READ OWNER_WRITE
63+
GROUP_READ WORLD_READ
64+
)

support-files/mysql-log-rotate.sh renamed to support-files/mysql-log-rotate.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0,

0 commit comments

Comments
 (0)