diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:53:07 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:53:07 +0200 |
| commit | e8d7e27fedf9db7e9143fe8eb2b6560696a1fea8 (patch) | |
| tree | 9070e8d565b56fa55f28f3f683c335d9d50359cf /mysql-test/t/mysqldump.test | |
| parent | 2a4c97fc3eb90c49f81219183dd6d9b998df3077 (diff) | |
| download | mariadb-git-e8d7e27fedf9db7e9143fe8eb2b6560696a1fea8.tar.gz | |
More after-merge fixes for merging MySQL 5.1.38 into MariaDB.
mysql-test/t/mysqldump.test:
Make test case work when build directory is not world readable
(this is the case for Buildbot checkouts).
mysys/my_getopt.c:
Restore bugfix which was lost in previous merge.
storage/xtradb/buf/buf0flu.c:
Fix extranous line caused by bad merge.
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 5eb0d627247..02923bd6e6f 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1982,6 +1982,9 @@ drop table if exists `load`; create table `load` (a varchar(255)); --copy_file std_data/words.dat $MYSQLTEST_VARDIR/tmp/load.txt +# LOAD DATA requires the file to be world-readable. This may not be true +# automatically, depending on how the build directory was created. +--chmod 0644 $MYSQLTEST_VARDIR/tmp/load.txt --exec $MYSQL_IMPORT --ignore test $MYSQLTEST_VARDIR/tmp/load.txt |