summaryrefslogtreecommitdiff
path: root/sql/derived_handler.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2019-02-09 22:54:26 -0800
committerIgor Babaev <igor@askmonty.org>2019-02-09 22:54:26 -0800
commitd11be23933def394585fae83a6f1ab561e3736f2 (patch)
tree867a809df45931d5c6ad00424c327cd47aae9392 /sql/derived_handler.cc
parent3f9040085a0de4976f55bc7e4a2fa5fa8d923100 (diff)
downloadmariadb-git-d11be23933def394585fae83a6f1ab561e3736f2.tar.gz
MDEV-17096 Pushdown of simple derived tables to storage engines
Resolved the problem of forming a proper query string for FEDERATEDX. Added test cases. Cleanup of extra spaces.
Diffstat (limited to 'sql/derived_handler.cc')
-rw-r--r--sql/derived_handler.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/derived_handler.cc b/sql/derived_handler.cc
index 561c18a5657..1fa5e94a1d4 100644
--- a/sql/derived_handler.cc
+++ b/sql/derived_handler.cc
@@ -16,7 +16,7 @@ void derived_handler::set_derived(TABLE_LIST *tbl)
Pushdown_derived::Pushdown_derived(TABLE_LIST *tbl, derived_handler *h)
: derived(tbl), handler(h)
-{
+{
is_analyze= handler->thd->lex->analyze_stmt;
}
@@ -42,7 +42,7 @@ int Pushdown_derived::execute()
handler->end_scan();
DBUG_RETURN(0);
}
-
+
while (!(err= handler->next_row()))
{
if (unlikely(thd->check_killed()))
@@ -50,7 +50,7 @@ int Pushdown_derived::execute()
handler->end_scan();
DBUG_RETURN(-1);
}
-
+
if ((err= table->file->ha_write_tmp_row(table->record[0])))
{
bool is_duplicate;
@@ -81,4 +81,4 @@ error_2:
handler->print_error(err, MYF(0));
DBUG_RETURN(-1); // Error not sent to client
}
-
+