diff options
| author | Terje Rosten <terje.rosten@oracle.com> | 2014-06-25 12:35:50 +0200 |
|---|---|---|
| committer | Terje Rosten <terje.rosten@oracle.com> | 2014-06-25 12:35:50 +0200 |
| commit | 5c4937c101a9f4127ee3f5e21447c872e4406209 (patch) | |
| tree | 11baaedbb73a5a6d6ab92ad727806313998b9251 /support-files | |
| parent | a44b4a188298c8c7e46cd20bf4198712ce91f762 (diff) | |
| download | mariadb-git-5c4937c101a9f4127ee3f5e21447c872e4406209.tar.gz | |
Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BIT
Bug#16415173 CRLF INSTEAD OF LF IN SQL-BENCH SCRIPTS
Correct perms and converts from Windows style to UNIX style line endings on some files.
Fix perms on installed ini files.
(MySQL 5.5 version)
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | support-files/config.huge.ini.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | support-files/config.medium.ini.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | support-files/config.small.ini.sh | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 3ad48520dfb..6aef51a5c16 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2014, 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 as published by @@ -56,12 +56,14 @@ IF(UNIX) IF(script MATCHES ".ini") SET(comp IniFiles) + SET(permissions OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) ELSE() SET(comp Server_Scripts) + SET(permissions OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} DESTINATION ${inst_location} COMPONENT ${comp} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + PERMISSIONS ${permissions}) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) diff --git a/support-files/config.huge.ini.sh b/support-files/config.huge.ini.sh index f98074828a7..f98074828a7 100755..100644 --- a/support-files/config.huge.ini.sh +++ b/support-files/config.huge.ini.sh diff --git a/support-files/config.medium.ini.sh b/support-files/config.medium.ini.sh index 1de7f64912e..1de7f64912e 100755..100644 --- a/support-files/config.medium.ini.sh +++ b/support-files/config.medium.ini.sh diff --git a/support-files/config.small.ini.sh b/support-files/config.small.ini.sh index 0af60e5dc91..0af60e5dc91 100755..100644 --- a/support-files/config.small.ini.sh +++ b/support-files/config.small.ini.sh |