diff options
-rw-r--r-- | sql/sql_lex.h | 4 | ||||
-rw-r--r-- | sql/sql_tvc.cc | 19 | ||||
-rw-r--r-- | sql/sql_tvc.h | 17 |
3 files changed, 35 insertions, 5 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index dfdeb9d4a83..3cec59193ff 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -756,7 +756,7 @@ public: { return reinterpret_cast<st_select_lex*>(slave); } - void set_with_clause(With_clause *with_cl); + inline void set_with_clause(With_clause *with_cl); st_select_lex_unit* next_unit() { return reinterpret_cast<st_select_lex_unit*>(next); @@ -1208,7 +1208,7 @@ public: void set_non_agg_field_used(bool val) { m_non_agg_field_used= val; } void set_agg_func_used(bool val) { m_agg_func_used= val; } - void set_with_clause(With_clause *with_clause); + inline void set_with_clause(With_clause *with_clause); With_clause *get_with_clause() { return master_unit()->with_clause; diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index f06ea049e3d..95947cbea45 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -1,3 +1,19 @@ +/* Copyright (c) 2017, MariaDB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 */ + +#include "mariadb.h" #include "sql_list.h" #include "sql_tvc.h" #include "sql_class.h" @@ -5,7 +21,7 @@ #include "sql_select.h" #include "sql_explain.h" #include "sql_parse.h" - +#include "sql_cte.h" /** @brief @@ -831,4 +847,3 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd) thd->lex->current_select= save_current_select; DBUG_RETURN(false); } - diff --git a/sql/sql_tvc.h b/sql/sql_tvc.h index 5524744a03c..b4fca78262b 100644 --- a/sql/sql_tvc.h +++ b/sql/sql_tvc.h @@ -1,3 +1,18 @@ +/* Copyright (c) 2017, MariaDB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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 */ + #ifndef SQL_TVC_INCLUDED #define SQL_TVC_INCLUDED #include "sql_type.h" @@ -47,4 +62,4 @@ public: void print(THD *thd_arg, String *str, enum_query_type query_type); }; -#endif /* SQL_TVC_INCLUDED */
\ No newline at end of file +#endif /* SQL_TVC_INCLUDED */ |