PBXT

Merge lp:~vkolesnikov/pbxt/pbxt-bug-379315 into lp:pbxt

  1. pbxt-bug-379315
  2. Merge into trunk
Proposed by Vladimir Kolesnikov
Status: Merged
Merged at revision: not available
Proposed branch: lp:~vkolesnikov/pbxt/pbxt-bug-379315
Merge into: lp:pbxt
Diff against target: None lines
To merge this branch: bzr merge lp:~vkolesnikov/pbxt/pbxt-bug-379315
Reviewer Review Type Date Requested Status
PBXT Core Pending
Review via email: mp+7815@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vladimir Kolesnikov (vkolesnikov) wrote :

delete.test update

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/mysql-test/r/delete.result'
2--- test/mysql-test/r/delete.result 2006-10-31 13:15:57 +0000
3+++ test/mysql-test/r/delete.result 2009-06-23 17:13:13 +0000
4@@ -125,18 +125,19 @@
5 0 11
6 2 12
7 delete ignore t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b <> (select b from t2 where t11.a < t2.a);
8-Warnings:
9-Error 1242 Subquery returns more than 1 row
10-Error 1242 Subquery returns more than 1 row
11+ERROR 21000: Subquery returns more than 1 row
12 select * from t11;
13 a b
14 0 10
15 1 11
16+2 12
17 select * from t12;
18 a b
19 33 10
20 0 11
21+2 12
22 insert into t11 values (2, 12);
23+ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
24 delete from t11 where t11.b <> (select b from t2 where t11.a < t2.a);
25 ERROR 21000: Subquery returns more than 1 row
26 select * from t11;
27@@ -145,13 +146,12 @@
28 1 11
29 2 12
30 delete ignore from t11 where t11.b <> (select b from t2 where t11.a < t2.a);
31-Warnings:
32-Error 1242 Subquery returns more than 1 row
33-Error 1242 Subquery returns more than 1 row
34+ERROR 21000: Subquery returns more than 1 row
35 select * from t11;
36 a b
37 0 10
38 1 11
39+2 12
40 drop table t11, t12, t2;
41 create table t1 (a int, b int, unique key (a), key (b));
42 insert into t1 values (3, 3), (7, 7);
43
44=== modified file 'test/mysql-test/t/delete.test'
45--- test/mysql-test/t/delete.test 2009-04-02 20:28:52 +0000
46+++ test/mysql-test/t/delete.test 2009-06-23 17:13:13 +0000
47@@ -120,13 +120,16 @@
48 delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b <> (select b from t2 where t11.a < t2.a);
49 select * from t11;
50 select * from t12;
51+--error 1242
52 delete ignore t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b <> (select b from t2 where t11.a < t2.a);
53 select * from t11;
54 select * from t12;
55+--error 1062
56 insert into t11 values (2, 12);
57 -- error 1242
58 delete from t11 where t11.b <> (select b from t2 where t11.a < t2.a);
59 select * from t11;
60+--error 1242
61 delete ignore from t11 where t11.b <> (select b from t2 where t11.a < t2.a);
62 select * from t11;
63 drop table t11, t12, t2;

Subscribers

People subscribed via source and target branches