diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
| commit | f03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch) | |
| tree | afb1235c5417019a563b1c1d64443f3b890d05df /mysql-test/r/multi_update.result | |
| parent | f0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff) | |
| parent | 35c35858f859f23c23a414cdb21fdfe39d5de11c (diff) | |
| download | mariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz | |
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
Diffstat (limited to 'mysql-test/r/multi_update.result')
| -rw-r--r-- | mysql-test/r/multi_update.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 0a6bf354f5d..e8522c2e97c 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -668,6 +668,11 @@ INSERT INTO t1 VALUES('2001-01-01'); UPDATE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1; Warnings: Warning 1292 Truncated incorrect date value: '1' +CREATE view v1 as SELECT f1() FROM t1; +UPDATE (SELECT 1 FROM t1 WHERE f1 = (select * from v1)) x, t1 SET f1 = 1; +Warnings: +Warning 1292 Truncated incorrect date value: '1' +DROP VIEW v1; DROP FUNCTION f1; DROP TABLE t1; end of tests |