From fa137476ff14a42c25f221585066d36124755f0a Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 3 Mar 2017 12:33:24 +0400 Subject: [PATCH] MDEV-11941 - Lintian complains about executable bits Revoked executable bit from files that are not supposed to be executed directly. Removed interpreted from files that are not supposed to be executed directly. Added interpreter to files that are supposed to be executed directly. --- mysql-test/lib/generate-ssl-certs.sh | 2 +- .../suite/innodb/include/ibd_convert.pl | 1 - .../parts/r/partition_exch_innodb.result | 0 .../parts/r/partition_exch_myisam.result | 0 .../r/partition_exch_myisam_innodb.result | 0 .../suite/parts/r/partition_exch_qa.result | 0 .../suite/parts/r/partition_exch_qa_11.result | 0 .../suite/parts/r/partition_exch_qa_14.result | 0 .../suite/parts/r/partition_exch_qa_3.result | 0 .../parts/r/partition_exch_qa_4_innodb.result | 0 .../parts/r/partition_exch_qa_4_myisam.result | 0 .../parts/r/partition_exch_qa_5_innodb.result | 0 .../parts/r/partition_exch_qa_5_myisam.result | 0 .../suite/parts/r/partition_exch_qa_6.result | 0 .../parts/r/partition_exch_qa_7_innodb.result | 0 .../parts/r/partition_exch_qa_7_myisam.result | 0 .../parts/r/partition_exch_qa_8_innodb.result | 0 .../parts/r/partition_exch_qa_8_myisam.result | 0 mysql-test/t/long_tmpdir-master.sh | 1 - mysql-test/t/lowercase_mixed_tmpdir-master.sh | 1 - .../t/lowercase_mixed_tmpdir_innodb-master.sh | 0 scripts/CMakeLists.txt | 49 +++++++++---------- .../{wsrep_sst_common.sh => wsrep_sst_common} | 0 .../generate_backing_table_tests_suite.sh | 3 +- .../oqgraph/maintainer-general-record.sh | 1 + 25 files changed, 27 insertions(+), 31 deletions(-) mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_innodb.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_myisam.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_myisam_innodb.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_11.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_14.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_3.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_6.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result mode change 100755 => 100644 mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result mode change 100755 => 100644 mysql-test/t/long_tmpdir-master.sh mode change 100755 => 100644 mysql-test/t/lowercase_mixed_tmpdir-master.sh mode change 100755 => 100644 mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh rename scripts/{wsrep_sst_common.sh => wsrep_sst_common} (100%) diff --git a/mysql-test/lib/generate-ssl-certs.sh b/mysql-test/lib/generate-ssl-certs.sh index 5dca21a755d..cc919dfe32e 100755 --- a/mysql-test/lib/generate-ssl-certs.sh +++ b/mysql-test/lib/generate-ssl-certs.sh @@ -1,4 +1,4 @@ -#/bin/sh -xe +#!/bin/sh -xe # simply run me from mysql-test/ cd std_data/ diff --git a/mysql-test/suite/innodb/include/ibd_convert.pl b/mysql-test/suite/innodb/include/ibd_convert.pl index 32eef96fd23..9c7e829f455 100644 --- a/mysql-test/suite/innodb/include/ibd_convert.pl +++ b/mysql-test/suite/innodb/include/ibd_convert.pl @@ -1,4 +1,3 @@ -#!/usr/bin/perl # Convert tablespace flags to the format understood by MariaDB 10.1.0..10.1.20, # with the assumption that the flags were correct. diff --git a/mysql-test/suite/parts/r/partition_exch_innodb.result b/mysql-test/suite/parts/r/partition_exch_innodb.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_myisam.result b/mysql-test/suite/parts/r/partition_exch_myisam.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_myisam_innodb.result b/mysql-test/suite/parts/r/partition_exch_myisam_innodb.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa.result b/mysql-test/suite/parts/r/partition_exch_qa.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_11.result b/mysql-test/suite/parts/r/partition_exch_qa_11.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_14.result b/mysql-test/suite/parts/r/partition_exch_qa_14.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_3.result b/mysql-test/suite/parts/r/partition_exch_qa_3.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_6.result b/mysql-test/suite/parts/r/partition_exch_qa_6.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result old mode 100755 new mode 100644 diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result old mode 100755 new mode 100644 diff --git a/mysql-test/t/long_tmpdir-master.sh b/mysql-test/t/long_tmpdir-master.sh old mode 100755 new mode 100644 index 7bcbee26105..318955fbcca --- a/mysql-test/t/long_tmpdir-master.sh +++ b/mysql-test/t/long_tmpdir-master.sh @@ -1,4 +1,3 @@ -#!/bin/sh d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789" test -d "$d" || mkdir "$d" rm -f "$d"/* diff --git a/mysql-test/t/lowercase_mixed_tmpdir-master.sh b/mysql-test/t/lowercase_mixed_tmpdir-master.sh old mode 100755 new mode 100644 index 9330d0581ee..95c26e3aa02 --- a/mysql-test/t/lowercase_mixed_tmpdir-master.sh +++ b/mysql-test/t/lowercase_mixed_tmpdir-master.sh @@ -1,4 +1,3 @@ -#!/bin/sh # This test requires a non-lowercase tmpdir directory on a case-sensitive # filesystem. diff --git a/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh b/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh old mode 100755 new mode 100644 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index d960f792a95..148dddccf30 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -73,6 +73,23 @@ IF(UNIX) ) ENDIF() +# Configure two scripts from one 'in' file. +# The maria_add_gis_sp.sql - to be sent to 'mysql' tool +# and the maria_add_gis_sp_bootstrap.sql, that can be sent to +# the server as a bootstrap command. + +SET(ADD_GIS_SP_SET_DELIMITER "delimiter |") +SET(ADD_GIS_SP_RESET_DELIMITER "delimiter ;") +SET(ADD_GIS_SP_EOL "|") +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in + ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql ESCAPE_QUOTES @ONLY) + +SET(ADD_GIS_SP_SET_DELIMITER "") +SET(ADD_GIS_SP_RESET_DELIMITER "") +SET(ADD_GIS_SP_EOL ";") +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in + ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql @@ -80,6 +97,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fill_help_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_data_timezone.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_to_mariadb.sql + ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql + ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -270,13 +289,14 @@ IF(WIN32) ENDFOREACH() ELSE() IF(WITH_WSREP) - SET(WSREP_BINARIES - wsrep_sst_common + SET(WSREP_SCRIPTS wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wsrep_sst_common + DESTINATION ${INSTALL_BINDIR} COMPONENT Server) ENDIF() IF (NOT WITHOUT_SERVER) SET(SERVER_SCRIPTS @@ -302,7 +322,7 @@ ELSE() mytop mysqlhotcopy ${SERVER_SCRIPTS} - ${WSREP_BINARIES} + ${WSREP_SCRIPTS} ${SYSTEMD_SCRIPTS} ) FOREACH(file ${BIN_SCRIPTS}) @@ -328,29 +348,6 @@ ELSE() ENDFOREACH() ENDIF() -# Configure two scripts from one 'in' file. -# The maria_add_gis_sp.sql - to be sent to 'mysql' tool -# and the maria_add_gis_sp_bootstrap.sql, that can be sent to -# the server as a bootstrap command. - -SET(ADD_GIS_SP_SET_DELIMITER "delimiter |") -SET(ADD_GIS_SP_RESET_DELIMITER "delimiter ;") -SET(ADD_GIS_SP_EOL "|") -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in - ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql ESCAPE_QUOTES @ONLY) - -SET(ADD_GIS_SP_SET_DELIMITER "") -SET(ADD_GIS_SP_RESET_DELIMITER "") -SET(ADD_GIS_SP_EOL ";") -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in - ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY) - -INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql - ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql - DESTINATION ${INSTALL_MYSQLSHAREDIR} - COMPONENT Server - ) - # Install libgcc as mylibgcc.a IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") EXECUTE_PROCESS ( diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common similarity index 100% rename from scripts/wsrep_sst_common.sh rename to scripts/wsrep_sst_common diff --git a/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh b/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh index 087b2b7089c..22feaab5c3a 100755 --- a/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh +++ b/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh @@ -45,7 +45,8 @@ done # Intended to be run from build as ../storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh MGFILE=maintainer-general-record.sh -echo '# This is a maintainer generated file. Generated at '`date`'.' > $MGFILE +echo '#!/bin/sh' > $MGFILE +echo '# This is a maintainer generated file. Generated at '`date`'.' >> $MGFILE for ENGINE in $ENGINES $ENGINES2 ; do echo mysql-test/mysql-test-run --record oqgraph.general-$ENGINE >> $MGFILE done diff --git a/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh b/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh index bc684015055..7af12013e53 100755 --- a/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh +++ b/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh @@ -1,3 +1,4 @@ +#!/bin/sh # This is a maintainer generated file. Generated at Wednesday 5 February 22:26:12 CST 2014. mysql-test/mysql-test-run --record oqgraph.general-MyISAM mysql-test/mysql-test-run --record oqgraph.general-MEMORY