diff options
Diffstat (limited to 'mysql-test/t/trigger-compat.test')
| -rw-r--r-- | mysql-test/t/trigger-compat.test | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test index db410ba2f18..2cc86692d0d 100644 --- a/mysql-test/t/trigger-compat.test +++ b/mysql-test/t/trigger-compat.test @@ -35,8 +35,7 @@ CREATE DATABASE mysqltest_db1; CREATE USER mysqltest_dfn@localhost; CREATE USER mysqltest_inv@localhost; -GRANT SUPER ON *.* TO mysqltest_dfn@localhost; -GRANT CREATE ON mysqltest_db1.* TO mysqltest_dfn@localhost; +GRANT CREATE, TRIGGER ON mysqltest_db1.* TO mysqltest_dfn@localhost; # # Create a table and the first trigger. @@ -67,17 +66,17 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 VALUE --disable_query_log --connection default CREATE TABLE patch (a blob); -eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG' INTO TABLE patch; +let $MYSQLD_DATADIR = `select @@datadir`; +eval LOAD DATA LOCAL INFILE '$MYSQLD_DATADIR/mysqltest_db1/t1.TRG' INTO TABLE patch; # remove original t1.TRG file so SELECT INTO OUTFILE won't fail ---remove_file $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG +--remove_file $MYSQLD_DATADIR/mysqltest_db1/t1.TRG eval SELECT SUBSTRING_INDEX(a,'definers=',1) INTO OUTFILE - '$MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG' + '$MYSQLD_DATADIR/mysqltest_db1/t1.TRG' FROM patch; DROP TABLE patch; --connection wl2818_definer_con --enable_query_log - # # Create a new trigger. # |