From de14db431ffdf58c87246673f41a0c0646011e94 Mon Sep 17 00:00:00 2001
From: Tor Didriksen <tor.didriksen@oracle.com>
Date: Mon, 23 Sep 2019 15:02:21 +0200
Subject: [PATCH] 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
---
 .../std_data/dd/sdi/upgrade/t_gen_stored.json |  0
 .../dd/sdi/upgrade_partition/sys_config.json  |  0
 .../dd/sdi/upgrade_partition/t1#p#p0.json     |  0
 support-files/CMakeLists.txt                  | 38 +++++++++++--------
 ...ysql-log-rotate.sh => mysql-log-rotate.in} |  2 +-
 ...ld_multi.server.sh => mysqld_multi.server} |  0
 6 files changed, 24 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 mysql-test/std_data/dd/sdi/upgrade/t_gen_stored.json
 mode change 100755 => 100644 mysql-test/std_data/dd/sdi/upgrade_partition/sys_config.json
 mode change 100755 => 100644 mysql-test/std_data/dd/sdi/upgrade_partition/t1#p#p0.json
 rename support-files/{mysql-log-rotate.sh => mysql-log-rotate.in} (96%)
 rename support-files/{mysqld_multi.server.sh => mysqld_multi.server} (100%)

diff --git a/mysql-test/std_data/dd/sdi/upgrade/t_gen_stored.json b/mysql-test/std_data/dd/sdi/upgrade/t_gen_stored.json
old mode 100755
new mode 100644
diff --git a/mysql-test/std_data/dd/sdi/upgrade_partition/sys_config.json b/mysql-test/std_data/dd/sdi/upgrade_partition/sys_config.json
old mode 100755
new mode 100644
diff --git a/mysql-test/std_data/dd/sdi/upgrade_partition/t1#p#p0.json b/mysql-test/std_data/dd/sdi/upgrade_partition/t1#p#p0.json
old mode 100755
new mode 100644
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index b0966766cda7..6785e0a196a9 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -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
+  )
diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.in
similarity index 96%
rename from support-files/mysql-log-rotate.sh
rename to support-files/mysql-log-rotate.in
index 27be14958936..3d6ef23a927f 100644
--- a/support-files/mysql-log-rotate.sh
+++ b/support-files/mysql-log-rotate.in
@@ -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,
diff --git a/support-files/mysqld_multi.server.sh b/support-files/mysqld_multi.server
similarity index 100%
rename from support-files/mysqld_multi.server.sh
rename to support-files/mysqld_multi.server