diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-24 08:20:00 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-24 08:20:00 +0100 |
| commit | bce773ea4e97657c208bbb07e673d188eeab075b (patch) | |
| tree | 62103e5dcf156a68637b6a420f15bae7a1df9569 /mysql-test/t/trigger-grant.test | |
| parent | 17093a0155897cc08f2bc74570510d2fcae2d110 (diff) | |
| parent | f80babd61720298f8e3862f21b1851203cbcf871 (diff) | |
| download | mariadb-git-bce773ea4e97657c208bbb07e673d188eeab075b.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
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 | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test index 2a0cf829bae..2e0b8707858 100644 --- a/mysql-test/t/trigger-grant.test +++ b/mysql-test/t/trigger-grant.test @@ -359,9 +359,19 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 FOR EACH ROW SET @a = 5; ---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 +# Replace definers with the "weird" definers +perl; +use strict; +use warnings; +my $fname= "$ENV{'MYSQLTEST_VARDIR'}/master-data/mysqltest_db1/t1.TRG"; +open(FILE, "<", $fname) or die; +my @content= grep($_ !~ /^definers=/, <FILE>); +close FILE; +open(FILE, ">", $fname) or die; +print FILE @content; +print FILE "definers='' '\@' '\@abc\@def\@\@' '\@hostname' '\@abcdef\@\@\@hostname'\n"; +close FILE; +EOF --echo |