summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-05-21 13:12:21 -0700
committerIgor Babaev <igor@askmonty.org>2011-05-21 13:12:21 -0700
commit63d6dbc4abe4e06a9fc4c933c91ea207b5d722d8 (patch)
tree416b4c2163420b3ac7c11742abb6757b63678024 /mysql-test/suite/pbxt
parentac321a3440a5ff48da5f96def454327335b69742 (diff)
downloadmariadb-git-63d6dbc4abe4e06a9fc4c933c91ea207b5d722d8.tar.gz
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.
Diffstat (limited to 'mysql-test/suite/pbxt')
-rw-r--r--mysql-test/suite/pbxt/r/derived.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/pbxt/r/derived.result b/mysql-test/suite/pbxt/r/derived.result
index 5a142456ebb..b4c1762e81a 100644
--- a/mysql-test/suite/pbxt/r/derived.result
+++ b/mysql-test/suite/pbxt/r/derived.result
@@ -231,8 +231,8 @@ count(*)
2
explain select count(*) from t1 INNER JOIN (SELECT A.E1, A.E2, A.E3 FROM t1 AS A WHERE A.E3 = (SELECT MAX(B.E3) FROM t1 AS B WHERE A.E2 = B.E2)) AS THEMAX ON t1.E1 = THEMAX.E2 AND t1.E1 = t1.E2;
id select_type table type possible_keys key key_len ref rows Extra
-1 PRIMARY A ALL NULL NULL NULL NULL 2 Using where
-1 PRIMARY t1 eq_ref PRIMARY PRIMARY 4 test.A.E2 1 Using where
+1 SIMPLE A ALL NULL NULL NULL NULL 2 Using where
+1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.A.E2 1 Using where
3 DEPENDENT SUBQUERY B ALL NULL NULL NULL NULL 2 Using where
drop table t1;
create table t1 (a int);