diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
| commit | 4f435bddfd44d40999f88685c61cc04e319d8d6c (patch) | |
| tree | f9d0655a0d901b87f918a736741144b502cba3f6 /mysql-test/r/multi_update.result | |
| parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
| parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
| download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz | |
5.3 merge
Diffstat (limited to 'mysql-test/r/multi_update.result')
| -rw-r--r-- | mysql-test/r/multi_update.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index d87d8c0fe3b..ca72521a819 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -665,8 +665,8 @@ UPDATE IGNORE ( SELECT ( SELECT COUNT(*) FROM t1 GROUP BY a, @v ) a FROM t2 ) x, t3 SET t3.a = 0; 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 DROP TABLE t1, t2, t3; SET SESSION sql_safe_updates = DEFAULT; # |