From 3a3a5b80f545af14cfa5b58bb2d898ecf78f4a63 Mon Sep 17 00:00:00 2001 From: dimitr Date: Fri, 27 Apr 2012 16:30:05 +0000 Subject: [PATCH] Fixed CORE-3834: Usage of a NATURAL JOIN with a derived table crashes the server. --- src/dsql/pass1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dsql/pass1.cpp b/src/dsql/pass1.cpp index f9309d21a18..c65cbcefefc 100644 --- a/src/dsql/pass1.cpp +++ b/src/dsql/pass1.cpp @@ -6467,7 +6467,7 @@ static dsql_nod* pass1_join(dsql_req* request, dsql_nod* input, bool proc_flag) coalesce->nod_arg[1] = MAKE_list(stack); impJoinLeft->value = MAKE_node(nod_alias, e_alias_count); - impJoinLeft->value->nod_arg[e_alias_value] = coalesce; + impJoinLeft->value->nod_arg[e_alias_value] = PASS1_node(request, coalesce, proc_flag); impJoinLeft->value->nod_arg[e_alias_alias] = reinterpret_cast(fldName); impJoinLeft->value->nod_arg[e_alias_imp_join] = reinterpret_cast(impJoinLeft);