diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-07 18:04:50 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-07 18:04:50 +0100 |
| commit | d942f408bcd9d965e05b96571155313d62918f48 (patch) | |
| tree | fc7d5341787684e835ccfa00baf29e765d72b459 /mysql-test/t/trigger-compat.test | |
| parent | 0522905ac3270e5ddcef79e96169d1d972d1fc13 (diff) | |
| parent | 6af1dca556a0a435f39ecc4ba779843d04001bf0 (diff) | |
| download | mariadb-git-d942f408bcd9d965e05b96571155313d62918f48.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_misc_functions.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_m.test:
Auto merged
mysql-test/t/rpl_loaddata_s.test:
Auto merged
mysql-test/t/rpl_misc_functions.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/r/mysqltest.result:
Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
"Use local" when merging 5.0 -> 5.1
Diffstat (limited to 'mysql-test/t/trigger-compat.test')
| -rw-r--r-- | mysql-test/t/trigger-compat.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test index 62ddd3b8930..9f7fd8bc505 100644 --- a/mysql-test/t/trigger-compat.test +++ b/mysql-test/t/trigger-compat.test @@ -60,8 +60,8 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 --echo --echo ---> patching 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 +--exec grep -v 'definers=' $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG +--exec mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG # # Create a new trigger. |