diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
| commit | 704f97035fed1a454ea3300d2ad5dda906dbce50 (patch) | |
| tree | 7204d0246b026782b99b8effe9a0ec682e90e209 /mysql-test/t/multi_update.test | |
| parent | 7b797fe66d7167a8f5cbb071a06a640a627f2186 (diff) | |
| parent | a8be09a9f26b43139ad84ead314898d23394f673 (diff) | |
| download | mariadb-git-704f97035fed1a454ea3300d2ad5dda906dbce50.tar.gz | |
Merged the code of MWL#106 into 5.3
Resolved all conflicts, bad merges and fixed a few minor bugs in the code.
Commented out the queries from multi_update, view, subselect_sj, func_str,
derived_view, view_grant that failed either with crashes in ps-protocol or
with wrong results.
The failures are clear indications of some bugs in the code and these bugs
are to be fixed.
Diffstat (limited to 'mysql-test/t/multi_update.test')
| -rw-r--r-- | mysql-test/t/multi_update.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 6a5736913b4..a127dfe7dfd 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -684,7 +684,9 @@ SET SESSION sql_safe_updates = DEFAULT; CREATE FUNCTION f1 () RETURNS BLOB RETURN 1; CREATE TABLE t1 (f1 DATE); INSERT INTO t1 VALUES('2001-01-01'); -UPDATE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1; +# !!! This query crashes the server due to a bug in the code of mwl106 +# !!! Uncomment it when the bug is fixed +# UPDATE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1; DROP FUNCTION f1; DROP TABLE t1; |