Commit 0750b5f8 authored by Monty's avatar Monty

Fixed compilation failures

- Also added missing copyright notices
parent 914e2c9b
...@@ -756,7 +756,7 @@ class st_select_lex_unit: public st_select_lex_node { ...@@ -756,7 +756,7 @@ class st_select_lex_unit: public st_select_lex_node {
{ {
return reinterpret_cast<st_select_lex*>(slave); 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() st_select_lex_unit* next_unit()
{ {
return reinterpret_cast<st_select_lex_unit*>(next); return reinterpret_cast<st_select_lex_unit*>(next);
...@@ -1208,7 +1208,7 @@ class st_select_lex: public st_select_lex_node ...@@ -1208,7 +1208,7 @@ class st_select_lex: public st_select_lex_node
void set_non_agg_field_used(bool val) { m_non_agg_field_used= val; } 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_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() With_clause *get_with_clause()
{ {
return master_unit()->with_clause; return master_unit()->with_clause;
......
/* 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_list.h"
#include "sql_tvc.h" #include "sql_tvc.h"
#include "sql_class.h" #include "sql_class.h"
...@@ -5,7 +21,7 @@ ...@@ -5,7 +21,7 @@
#include "sql_select.h" #include "sql_select.h"
#include "sql_explain.h" #include "sql_explain.h"
#include "sql_parse.h" #include "sql_parse.h"
#include "sql_cte.h"
/** /**
@brief @brief
...@@ -831,4 +847,3 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd) ...@@ -831,4 +847,3 @@ bool JOIN::transform_in_predicates_into_in_subq(THD *thd)
thd->lex->current_select= save_current_select; thd->lex->current_select= save_current_select;
DBUG_RETURN(false); DBUG_RETURN(false);
} }
/* 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 #ifndef SQL_TVC_INCLUDED
#define SQL_TVC_INCLUDED #define SQL_TVC_INCLUDED
#include "sql_type.h" #include "sql_type.h"
...@@ -47,4 +62,4 @@ class table_value_constr : public Sql_alloc ...@@ -47,4 +62,4 @@ class table_value_constr : public Sql_alloc
void print(THD *thd_arg, String *str, enum_query_type query_type); void print(THD *thd_arg, String *str, enum_query_type query_type);
}; };
#endif /* SQL_TVC_INCLUDED */ #endif /* SQL_TVC_INCLUDED */
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment