diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
| commit | c07325f932abef2032b2e56532f6cb615e2a1161 (patch) | |
| tree | 754ca158e45ebc014e5cbeaf4c3e7581f9575d76 /sql/item_subselect.cc | |
| parent | 7f8187bc432f79afe4c0549d68845a68e6c159ab (diff) | |
| parent | 2ae83affef5a4d89f38272db31a400f968279a7a (diff) | |
| download | mariadb-git-c07325f932abef2032b2e56532f6cb615e2a1161.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 5a1a8c7ee68..9f58999d4cc 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /** @file @@ -275,7 +275,7 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref) { if (sl->tvc) { - wrap_tvc_in_derived_table(thd, sl); + wrap_tvc_into_select(thd, sl); } } @@ -720,11 +720,14 @@ bool 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());); + Item::Print print(this, + enum_query_type(QT_TO_SYSTEM_CHARSET | + QT_WITHOUT_INTRODUCERS)); + + push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, + ER_UNKNOWN_ERROR, "DBUG: Item_subselect::exec %.*s", + print.length(),print.ptr()); + ); /* Do not execute subselect in case of a fatal error or if the query has been killed. |