summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_group.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-05-16 22:39:43 -0700
committerIgor Babaev <igor@askmonty.org>2011-05-16 22:39:43 -0700
commit704f97035fed1a454ea3300d2ad5dda906dbce50 (patch)
tree7204d0246b026782b99b8effe9a0ec682e90e209 /mysql-test/r/func_group.result
parent7b797fe66d7167a8f5cbb071a06a640a627f2186 (diff)
parenta8be09a9f26b43139ad84ead314898d23394f673 (diff)
downloadmariadb-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/r/func_group.result')
-rw-r--r--mysql-test/r/func_group.result3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index 27474278f05..4732c09c118 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -1854,9 +1854,8 @@ HAVING ('m') IN (
SELECT v
FROM t2);
id select_type table type possible_keys key key_len ref rows Extra
-1 PRIMARY <derived2> system NULL NULL NULL NULL 0 const row not found
+1 PRIMARY empty1 system NULL NULL NULL NULL 0 const row not found
3 SUBQUERY t2 ALL NULL NULL NULL NULL 2
-2 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table
#
# 5) Test that subquery materialization is setup for query with