diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-13 21:47:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-13 21:47:56 +0200 |
| commit | f947f73b2b6d2bd246b81a9038224d2a85777520 (patch) | |
| tree | a21a8187ab0d43afdf5995693cdca349f3b0caf8 | |
| parent | fec5ab5a56cb9a45c621207620cc85079cddf537 (diff) | |
| parent | e3ac16d7210de73b2479957117ede6a6732268ad (diff) | |
| download | mariadb-git-f947f73b2b6d2bd246b81a9038224d2a85777520.tar.gz | |
Merge branch '10.1' of https://github.com/ottok/server into ottok-10.1
| -rwxr-xr-x[-rw-r--r--] | mysql-test/std_data/checkDBI_DBD-mysql.pl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mysql-test/suite/rpl/extension/checksum.pl | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mysql-test/t/long_tmpdir-master.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mysql-test/t/lowercase_mixed_tmpdir-master.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/checkDBI_DBD-mysql.pl b/mysql-test/std_data/checkDBI_DBD-mysql.pl index d62d2f8bfc0..d62d2f8bfc0 100644..100755 --- a/mysql-test/std_data/checkDBI_DBD-mysql.pl +++ b/mysql-test/std_data/checkDBI_DBD-mysql.pl diff --git a/mysql-test/suite/rpl/extension/checksum.pl b/mysql-test/suite/rpl/extension/checksum.pl index 60dca18c8f8..60dca18c8f8 100644..100755 --- a/mysql-test/suite/rpl/extension/checksum.pl +++ b/mysql-test/suite/rpl/extension/checksum.pl diff --git a/mysql-test/t/long_tmpdir-master.sh b/mysql-test/t/long_tmpdir-master.sh index 7bcbee26105..7bcbee26105 100644..100755 --- a/mysql-test/t/long_tmpdir-master.sh +++ b/mysql-test/t/long_tmpdir-master.sh diff --git a/mysql-test/t/lowercase_mixed_tmpdir-master.sh b/mysql-test/t/lowercase_mixed_tmpdir-master.sh index 9330d0581ee..9330d0581ee 100644..100755 --- a/mysql-test/t/lowercase_mixed_tmpdir-master.sh +++ b/mysql-test/t/lowercase_mixed_tmpdir-master.sh diff --git a/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh b/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh index 95c26e3aa02..95c26e3aa02 100644..100755 --- a/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh +++ b/mysql-test/t/lowercase_mixed_tmpdir_innodb-master.sh |