diff options
| author | unknown <kostja@vajra.(none)> | 2007-05-18 12:33:12 +0400 |
|---|---|---|
| committer | unknown <kostja@vajra.(none)> | 2007-05-18 12:33:12 +0400 |
| commit | bf1198a91354a659a812a7490ac180768b19fe05 (patch) | |
| tree | c0e81154e6510f3bbdceaf29220327ccc6f33141 /mysql-test/t/trigger.test | |
| parent | d1c57f503f1cb082311ca371465332047854feea (diff) | |
| parent | fda27597eef5315ae0334ce6354d0dfe807e6672 (diff) | |
| download | mariadb-git-bf1198a91354a659a812a7490ac180768b19fe05.tar.gz | |
Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
into vajra.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/trigger.test')
| -rw-r--r-- | mysql-test/t/trigger.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 616e184796e..e63417809cc 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -1000,9 +1000,9 @@ create trigger t1_bi after insert on t1 for each row insert into t3 values (new. # Until we implement proper mechanism for invalidation of PS/SP when table # or SP's are changed these two statements will fail with 'Table ... was # not locked' error (this mechanism should be based on the new TDC). ---error 1100 #ER_TABLE_NOT_LOCKED +--error ER_NO_SUCH_TABLE execute stmt1; ---error 1100 #ER_TABLE_NOT_LOCKED +--error ER_NO_SUCH_TABLE call p1(); deallocate prepare stmt1; drop procedure p1; |