From 63d6dbc4abe4e06a9fc4c933c91ea207b5d722d8 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Sat, 21 May 2011 13:12:21 -0700 Subject: Fixed 3 valgrind bugs. Two of them (in the function make_join_statistics and in the function sort_and_filter_keyuse) were due to bad merges while the third bug was triggered by uninitialized values of the field JOIN_TAB::preread_init_done. Fixed a compiler warning in mysql_priv.h. Commented out some queries from the funcs_1 suite returning wrong errors due to bugs concerning updatable views (see bugs 784297 and 784303). Adjusted some results for the test cases with derived tables from different suites. --- mysql-test/t/multi_update.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/t/multi_update.test') diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index a127dfe7dfd..914a1a3b4a1 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -684,7 +684,7 @@ 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'); -# !!! This query crashes the server due to a bug in the code of mwl106 +# !!! This query returns a wrong error 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; -- cgit v1.2.1