diff options
| author | unknown <kent@mysql.com> | 2006-03-07 21:52:50 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-07 21:52:50 +0100 |
| commit | 217fdd8896fe73e7261c517f9e237d261c876c15 (patch) | |
| tree | d7782c7e134fc3ed292487602f208144ce049abe /mysql-test/t/trigger-grant.test | |
| parent | 6856ffec11b033822b5c5a8669d1d201ffa3c2e5 (diff) | |
| parent | f4c81a219a8842f9bb46fa79e5e5ff652b244850 (diff) | |
| download | mariadb-git-217fdd8896fe73e7261c517f9e237d261c876c15.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
Diffstat (limited to 'mysql-test/t/trigger-grant.test')
| -rw-r--r-- | mysql-test/t/trigger-grant.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test index c0a12c3ecb5..e79abf1b826 100644 --- a/mysql-test/t/trigger-grant.test +++ b/mysql-test/t/trigger-grant.test @@ -362,9 +362,9 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 FOR EACH ROW SET @a = 5; ---exec egrep -v '^definers=' $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG ---exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQLTEST_VARDIR/tmp/t1.TRG ---exec mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG +--system grep -v '^definers=' $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG +--system echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQLTEST_VARDIR/tmp/t1.TRG +--system mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG --echo |