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 | 410b1dd86d18b87f95d690b2aa2c4fec6b62166d (patch) | |
tree | 11baaedbb73a5a6d6ab92ad727806313998b9251 /mysql-test | |
parent | 0bbd354bdad77603f4b0afa7622e7d3f5b2d76af (diff) | |
download | mariadb-git-410b1dd86d18b87f95d690b2aa2c4fec6b62166d.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 'mysql-test')
-rw-r--r--[-rwxr-xr-x] | mysql-test/collections/default.weekly | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/r/lowercase_table4.result | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/suite/innodb/r/innodb_bug57904.result | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/suite/innodb/r/innodb_bug60196.result | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/suite/innodb/t/innodb_bug57904.test | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/suite/innodb/t/innodb_bug60196-master.opt | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/suite/innodb/t/innodb_bug60196.test | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | mysql-test/t/long_tmpdir-master.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | mysql-test/t/lowercase_mixed_tmpdir-master.sh | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/t/lowercase_table4-master.opt | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | mysql-test/t/lowercase_table4.test | 0 |
11 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/collections/default.weekly b/mysql-test/collections/default.weekly index a03e2593cfe..a03e2593cfe 100755..100644 --- a/mysql-test/collections/default.weekly +++ b/mysql-test/collections/default.weekly diff --git a/mysql-test/r/lowercase_table4.result b/mysql-test/r/lowercase_table4.result index f896b9008e3..f896b9008e3 100755..100644 --- a/mysql-test/r/lowercase_table4.result +++ b/mysql-test/r/lowercase_table4.result diff --git a/mysql-test/suite/innodb/r/innodb_bug57904.result b/mysql-test/suite/innodb/r/innodb_bug57904.result index d265adc385f..d265adc385f 100755..100644 --- a/mysql-test/suite/innodb/r/innodb_bug57904.result +++ b/mysql-test/suite/innodb/r/innodb_bug57904.result diff --git a/mysql-test/suite/innodb/r/innodb_bug60196.result b/mysql-test/suite/innodb/r/innodb_bug60196.result index 411950b49dd..411950b49dd 100755..100644 --- a/mysql-test/suite/innodb/r/innodb_bug60196.result +++ b/mysql-test/suite/innodb/r/innodb_bug60196.result diff --git a/mysql-test/suite/innodb/t/innodb_bug57904.test b/mysql-test/suite/innodb/t/innodb_bug57904.test index 1131e24844d..1131e24844d 100755..100644 --- a/mysql-test/suite/innodb/t/innodb_bug57904.test +++ b/mysql-test/suite/innodb/t/innodb_bug57904.test diff --git a/mysql-test/suite/innodb/t/innodb_bug60196-master.opt b/mysql-test/suite/innodb/t/innodb_bug60196-master.opt index c0a1981fa7c..ac4d3211e89 100755..100644 --- a/mysql-test/suite/innodb/t/innodb_bug60196-master.opt +++ b/mysql-test/suite/innodb/t/innodb_bug60196-master.opt @@ -1 +1 @@ ---lower-case-table-names=2
+--lower-case-table-names=2 diff --git a/mysql-test/suite/innodb/t/innodb_bug60196.test b/mysql-test/suite/innodb/t/innodb_bug60196.test index ea85653f1af..ea85653f1af 100755..100644 --- a/mysql-test/suite/innodb/t/innodb_bug60196.test +++ b/mysql-test/suite/innodb/t/innodb_bug60196.test diff --git a/mysql-test/t/long_tmpdir-master.sh b/mysql-test/t/long_tmpdir-master.sh index 318955fbcca..1edb0b2133d 100644..100755 --- a/mysql-test/t/long_tmpdir-master.sh +++ b/mysql-test/t/long_tmpdir-master.sh @@ -1,3 +1,5 @@ +#! /bin/bash + 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 index 95c26e3aa02..cb34f9f7202 100644..100755 --- a/mysql-test/t/lowercase_mixed_tmpdir-master.sh +++ b/mysql-test/t/lowercase_mixed_tmpdir-master.sh @@ -1,3 +1,5 @@ +#! /bin/bash + # This test requires a non-lowercase tmpdir directory on a case-sensitive # filesystem. diff --git a/mysql-test/t/lowercase_table4-master.opt b/mysql-test/t/lowercase_table4-master.opt index c0a1981fa7c..ac4d3211e89 100755..100644 --- a/mysql-test/t/lowercase_table4-master.opt +++ b/mysql-test/t/lowercase_table4-master.opt @@ -1 +1 @@ ---lower-case-table-names=2
+--lower-case-table-names=2 diff --git a/mysql-test/t/lowercase_table4.test b/mysql-test/t/lowercase_table4.test index 783a4fcae51..783a4fcae51 100755..100644 --- a/mysql-test/t/lowercase_table4.test +++ b/mysql-test/t/lowercase_table4.test |