diff options
| author | unknown <kent@mysql.com> | 2005-12-09 15:32:07 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-09 15:32:07 +0100 |
| commit | d69106422e665deb035e66821acff29c0c351128 (patch) | |
| tree | e25e8af8eaa88c4f1c33c461c9cc2e35d3424cce /mysql-test | |
| parent | 9e013ec2d1ec656117fa257f20df5558f3ce8ba9 (diff) | |
| parent | 72d328d96cd8f53f8f4be7bc76be0d117b051b19 (diff) | |
| download | mariadb-git-d69106422e665deb035e66821acff29c0c351128.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/trigger-compat.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/trigger-grant.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test index ace18639172..c2acc235135 100644 --- a/mysql-test/t/trigger-compat.test +++ b/mysql-test/t/trigger-compat.test @@ -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 # diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test index c058816ee75..deeaeacbccc 100644 --- a/mysql-test/t/trigger-grant.test +++ b/mysql-test/t/trigger-grant.test @@ -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 |