diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 84b0af98963..992510a18e6 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2232,12 +2232,6 @@ bool st_select_lex::test_limit() -st_select_lex_unit* st_select_lex_unit::master_unit() -{ - return this; -} - - st_select_lex* st_select_lex_unit::outer_select() { return (st_select_lex*) master; @@ -2345,12 +2339,6 @@ bool st_select_lex::add_ftfunc_to_list(Item_func_match *func) } -st_select_lex_unit* st_select_lex::master_unit() -{ - return (st_select_lex_unit*) master; -} - - st_select_lex* st_select_lex::outer_select() { return (st_select_lex*) master->get_master(); diff --git a/sql/sql_lex.h b/sql/sql_lex.h index dcbbb98fcba..20b156a36b6 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -526,7 +526,6 @@ public: void exclude(); void exclude_from_tree(); - virtual st_select_lex_unit* master_unit()= 0; virtual st_select_lex* outer_select()= 0; virtual st_select_lex* return_after_parsing()= 0; @@ -668,7 +667,6 @@ public: TABLE *insert_table_with_stored_vcol; void init_query(); - st_select_lex_unit* master_unit(); st_select_lex* outer_select(); st_select_lex* first_select() { @@ -898,7 +896,7 @@ public: void init_query(); void init_select(); - st_select_lex_unit* master_unit(); + st_select_lex_unit* master_unit() { return (st_select_lex_unit*) master; } st_select_lex_unit* first_inner_unit() { return (st_select_lex_unit*) slave;