diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-12-08 15:49:43 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-12-08 15:49:43 +0400 |
| commit | ab4c37dcce7f82493552d839920bf979f9af3ecb (patch) | |
| tree | 3f5808c4f1df2167e359f23ff9b392810d3875f8 /mysql-test/t/trigger.test | |
| parent | 893055bed6828ef4330b06b36ca6397cfa73fc3c (diff) | |
| parent | 298aff126768cc6fe81714b5bf8b3ae23f153444 (diff) | |
| download | mariadb-git-ab4c37dcce7f82493552d839920bf979f9af3ecb.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/embt/my51-embt
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/include/federated.inc:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/status.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/flush_block_commit.result:
SCCS merged
Diffstat (limited to 'mysql-test/t/trigger.test')
| -rw-r--r-- | mysql-test/t/trigger.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 12262894e5b..93bd7815e01 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -1140,6 +1140,7 @@ select trigger_schema, trigger_name, event_object_schema, # Trick which makes update of second .TRN file impossible system echo dummy >$MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~; system chmod 000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~; +--replace_result $MYSQLTEST_VARDIR . master-data/ '' --error 1 rename table t1 to t2; # 't1' should be still there and triggers should work correctly |