diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 19:28:05 +0200 |
| commit | 24e452a208adebedce6a8a418265fced66bfb027 (patch) | |
| tree | 83bc0c6e237fbd9f9dcbd2ac79f03a3b86756239 /mysql-test/r/delete.result | |
| parent | 8a09adb3eaf036b652b11afea7d9d86a978fa566 (diff) | |
| parent | 148587461954b544355bc808a89bfed1a70694e1 (diff) | |
| download | mariadb-git-24e452a208adebedce6a8a418265fced66bfb027.tar.gz | |
Merge with 5.1 & fixes to IGNORE handling
Diffstat (limited to 'mysql-test/r/delete.result')
| -rw-r--r-- | mysql-test/r/delete.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result index 7d6fc30be67..d9623ca21b7 100644 --- a/mysql-test/r/delete.result +++ b/mysql-test/r/delete.result @@ -126,8 +126,8 @@ a b 2 12 delete ignore t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b <> (select b from t2 where t11.a < t2.a); Warnings: -Error 1242 Subquery returns more than 1 row -Error 1242 Subquery returns more than 1 row +Warning 1242 Subquery returns more than 1 row +Warning 1242 Subquery returns more than 1 row select * from t11; a b 0 10 @@ -146,8 +146,8 @@ a b 2 12 delete ignore from t11 where t11.b <> (select b from t2 where t11.a < t2.a); Warnings: -Error 1242 Subquery returns more than 1 row -Error 1242 Subquery returns more than 1 row +Warning 1242 Subquery returns more than 1 row +Warning 1242 Subquery returns more than 1 row select * from t11; a b 0 10 |