diff options
| author | Sven Sandberg <sven@mysql.com> | 2008-07-04 11:33:34 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven@mysql.com> | 2008-07-04 11:33:34 +0200 |
| commit | eb05cd9e4ff1e0927a148b237667923eea3a39ca (patch) | |
| tree | 248c9874596778a4ce859f43860ce1b93a1109fb /mysql-test/std_data | |
| parent | 079fa90b8dd2ff59d3a6d4e432226438cec44be7 (diff) | |
| download | mariadb-git-eb05cd9e4ff1e0927a148b237667923eea3a39ca.tar.gz | |
BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable
Problem 1: main.loaddata tried to trigger an error caused by
reading files outside the vardir, by reading itself. However,
if loaddata.test is not world-readable (e.g., umask=0077),
then another error is triggered.
Fix 1: allow the other error too.
Problem 2: rpl_slave_skip and rpl_innodb_mixed_dml tried to
copy a file from mysql-test/suite/rpl/data to mysql-test/var
and then read it. That failed too if umask=0077, since the
file would not become world-readable.
Fix 2: move the files from mysql-test/suite/rpl/data to
mysql-test/std_data and update tests accordingly. Remove
the directory mysql-test/suite/rpl/data.
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/rpl_bug28618.dat | 3 | ||||
| -rw-r--r-- | mysql-test/std_data/rpl_mixed.dat | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/std_data/rpl_bug28618.dat b/mysql-test/std_data/rpl_bug28618.dat new file mode 100644 index 00000000000..b800c4dd39d --- /dev/null +++ b/mysql-test/std_data/rpl_bug28618.dat @@ -0,0 +1,3 @@ +1|master only +2|master only +3|master only diff --git a/mysql-test/std_data/rpl_mixed.dat b/mysql-test/std_data/rpl_mixed.dat new file mode 100644 index 00000000000..131c57750cc --- /dev/null +++ b/mysql-test/std_data/rpl_mixed.dat @@ -0,0 +1,3 @@ +10|line A +20|line B +30|line C |