Commit 2c9ff654 authored by kent@mysql.com's avatar kent@mysql.com
Browse files

trigger-grant.test, trigger-compat.test: 

  Removed --text from grep, not portable
parent 8fd7e5f9

mysql-test/t/trigger-compat.test

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 
--echo

--echo ---> patching t1.TRG...



--exec grep --text -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG

--exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG

--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG



#

mysql-test/t/trigger-grant.test

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 
  FOR EACH ROW

    SET @a = 5;



--exec egrep --text -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG

--exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG

--exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG

--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG