diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-27 00:03:55 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-27 00:03:55 -0700 |
| commit | c9a349488b95a9a938564fe1ac06dafc70db5864 (patch) | |
| tree | db5bff7867f4d077edaf2a9c9b4a737e25973dbf /mysql-test/suite/innodb/r | |
| parent | 317e04ce67d97ab4a11582236f1e46ccf25c94fb (diff) | |
| download | mariadb-git-c9a349488b95a9a938564fe1ac06dafc70db5864.tar.gz | |
Applied Sanja's patch to fix LP bug #784297 in the tree for mwl106.
The patch imposes unconditional materialization for derived tables
used in update and multi-update statements.
Fixed a bug with a wrong order of processing derived tables/views
at the prepare stage that caused a crash for the variant of the
query from test case for bug 52157.
Diffstat (limited to 'mysql-test/suite/innodb/r')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_multi_update.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_multi_update.result b/mysql-test/suite/innodb/r/innodb_multi_update.result index 924470faedd..558fc3938a8 100644 --- a/mysql-test/suite/innodb/r/innodb_multi_update.result +++ b/mysql-test/suite/innodb/r/innodb_multi_update.result @@ -79,4 +79,6 @@ drop table bug38999_1,bug38999_2; # CREATE TABLE t1(f1 INT) ENGINE=INNODB; INSERT INTO t1 VALUES(1); +UPDATE (SELECT ((SELECT 1 FROM t1), 1) FROM t1 WHERE (SELECT 1 FROM t1)) x, (SELECT 1) AS d SET d.f1 = 1; +ERROR 21000: Operand should contain 1 column(s) DROP TABLE t1; |