summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-05-20 12:36:30 +0200
committerSergei Golubchik <sergii@pisem.net>2013-05-20 12:36:30 +0200
commitd7a6c801ac6890fd8a218484db5293afdcc2808a (patch)
treed399d63510cafdb2bb11ac083ae285aaebbb9096 /sql/item.h
parentdb7085dfae07e8cf4e98e41bd0dc111fb1b4896b (diff)
parent639a766096733861ce5f4ed4863d9db37090a4f4 (diff)
downloadmariadb-git-d7a6c801ac6890fd8a218484db5293afdcc2808a.tar.gz
5.3 merge.
change maria.distinct to use a function that doesn't require ssl-enabled builds
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index 891a1500eb1..2b0456bd30c 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -384,6 +384,12 @@ struct Name_resolution_context: Sql_alloc
{
(*error_processor)(thd, error_processor_data);
}
+ st_select_lex *outer_select()
+ {
+ return (outer_context ?
+ outer_context->select_lex :
+ NULL);
+ }
};