summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-22 13:20:44 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-22 13:20:44 +0200
commitca80e14a882b1928350ef0522607cd1011048941 (patch)
tree05d992be3d25cf47e38c7bc1ea2dacee485f33c5 /sql/item_subselect.cc
parentc23d4700e6d9ea4f32eda6965ffc907fa83425e8 (diff)
parent1c60f40868f6067be81a50198e1c72df08814adf (diff)
downloadmariadb-git-ca80e14a882b1928350ef0522607cd1011048941.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 7aa2ed489a3..4fb9abce0e2 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -715,6 +715,12 @@ bool Item_subselect::exec()
DBUG_ENTER("Item_subselect::exec");
DBUG_ASSERT(fixed);
+ DBUG_EXECUTE_IF("Item_subselect",
+ push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
+ ER_UNKNOWN_ERROR, "DBUG: Item_subselect::exec %s",
+ Item::Print(this,
+ enum_query_type(QT_TO_SYSTEM_CHARSET |
+ QT_WITHOUT_INTRODUCERS)).ptr()););
/*
Do not execute subselect in case of a fatal error
or if the query has been killed.