mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
fb17cbe42e
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. mysql-test/r/loaddata.result: Updated result file. mysql-test/std_data/rpl_bug28618.dat: Moved this file to std_data. mysql-test/std_data/rpl_mixed.dat: Moved this file to std_data. mysql-test/suite/rpl/data: Removed directory that is now unused. mysql-test/suite/rpl/include/rpl_mixed_dml.inc: The rpl_mixed.dat file has been moved. Updated the test to use the new location. mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Updated result file. mysql-test/suite/rpl/r/rpl_slave_skip.result: Updated result file. mysql-test/suite/rpl/t/rpl_slave_skip.test: The rpl_bug28618.dat file has been moved. Updated the test to use the new location. mysql-test/t/loaddata.test: Allow more error messages. ER_TEXTFILE_NOT_READABLE may happen if the file is not world-readable (which may happen, e.g., if the user has umask=0077). |
||
|---|---|---|
| .. | ||
| funcs_1 | ||
| ndb_backup50 | ||
| ndb_backup51 | ||
| ndb_backup51_data_be | ||
| ndb_backup51_data_le | ||
| parts | ||
| 14897.frm | ||
| bad_gis_data.dat | ||
| bug15328.cnf | ||
| bug16266.000001 | ||
| bug19371.frm | ||
| bug19371.MYD | ||
| bug19371.MYI | ||
| bug30435_5k.txt | ||
| bug30435_10k_items.txt | ||
| bug33029-slave-relay-bin.000001 | ||
| bug35469.dat | ||
| bug36055.frm | ||
| bug36055.MYD | ||
| bug36055.MYI | ||
| cacert.pem | ||
| charset_utf8.txt | ||
| client-cert.pem | ||
| client-key.pem | ||
| corrupt-relay-bin.000624 | ||
| des_key_file | ||
| Index.xml | ||
| init_file.dat | ||
| loaddata1.dat | ||
| loaddata2.dat | ||
| loaddata3.dat | ||
| loaddata4.dat | ||
| loaddata5.dat | ||
| loaddata6.dat | ||
| loaddata_dq.dat | ||
| loaddata_pair.dat | ||
| master-bin.000001 | ||
| Moscow_leap | ||
| ndb_config_config.ini | ||
| ndb_config_mycnf1.cnf | ||
| ndb_config_mycnf2.cnf | ||
| numbers.txt | ||
| old_table-323.frm | ||
| rpl_bug28618.dat | ||
| rpl_loaddata.dat | ||
| rpl_loaddata2.dat | ||
| rpl_mixed.dat | ||
| rpl_timezone.dat | ||
| rpl_timezone2.dat | ||
| server-cert-des.pem | ||
| server-cert.pem | ||
| server-key-des.pem | ||
| server-key.pem | ||
| server8k-cert.pem | ||
| server8k-key.pem | ||
| trunc_binlog.000001 | ||
| untrusted-cacert.pem | ||
| vchar.frm | ||
| warnings_loaddata.dat | ||
| words.dat | ||
| words2.dat | ||