diff options
| author | unknown <svoj@june.mysql.com> | 2007-06-07 12:07:41 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-06-07 12:07:41 +0500 |
| commit | 3ee66aa65ec69355f17e3589d927f5f8109c2e21 (patch) | |
| tree | 37f6a1dedde1283cc37cc15edf554f5731db2b90 /mysql-test/r/lock.result | |
| parent | b58a9183e0bafe77b543046faf74e5a0b3d421c7 (diff) | |
| parent | 55c765925d4723c1702d84aef8f305cd97691fea (diff) | |
| download | mariadb-git-3ee66aa65ec69355f17e3589d927f5f8109c2e21.tar.gz | |
Merge 81.176.158.240:devel/mysql/BUG26976/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/lock.result')
| -rw-r--r-- | mysql-test/r/lock.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result index 079b0253ff6..a5a78ecc986 100644 --- a/mysql-test/r/lock.result +++ b/mysql-test/r/lock.result @@ -40,7 +40,8 @@ test.t1 check status OK lock tables t1 write; check table t2; Table Op Msg_type Msg_text -test.t2 check error Table 't2' was not locked with LOCK TABLES +test.t2 check Error Table 't2' was not locked with LOCK TABLES +test.t2 check error Corrupt insert into t1 select index1,nr from t1; ERROR HY000: Table 't1' was not locked with LOCK TABLES unlock tables; |