Commit bce773ea authored by unknown's avatar unknown
Browse files

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
parents 17093a01 f80babd6

mysql-test/t/trigger-grant.test

+13 −3
Original line number Diff line number Diff line
@@ -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