database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable

Browse Source 
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).
This commit is contained in:
Sven Sandberg
2008-07-04 11:33:34 +02:00
parent 43e396c8d5
commit fb17cbe42e
8 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
View File

@ -103,7 +103,7 @@ DELETE FROM t1;
DELETE FROM t2;
******************** LOAD DATA INFILE ********************
LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;
LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;
SELECT * FROM t1 ORDER BY a;
a b
10 line A
@ -884,7 +884,7 @@ master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t2
master-bin.000001 # Xid 1 # #
master-bin.000001 # Query 1 # use `test_rpl`; BEGIN
master-bin.000001 # Begin_load_query 1 # ;file_id=#;block_len=#
master-bin.000001 # Execute_load_query 1 # use `test_rpl`; LOAD DATA INFILE '../../tmp/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;file_id=#
master-bin.000001 # Execute_load_query 1 # use `test_rpl`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE t1 FIELDS TERMINATED BY '|' ;file_id=#
master-bin.000001 # Xid 1 # #
master-bin.000001 # Query 1 # use `test_rpl`; BEGIN
master-bin.000001 # Query 1 # use `test_rpl`; DELETE FROM t1