Skip to content

M
mariadb
Commit a7bdd197 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua
Browse files
Options

subqueries made printable 

new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
parent ddf4d1e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 735 additions and 181 deletions
mysql-test/r/subselect.result
View file @ a7bdd197
This diff is collapsed.
mysql-test/r/union.result
View file @ a7bdd197
...@@ -86,10 +86,12 @@ a b ...@@ -86,10 +86,12 @@ a b
1 a 1 a
(select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b; (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b;
ERROR 42000: Table 't1' from one of SELECT's can not be used in global ORDER clause ERROR 42000: Table 't1' from one of SELECT's can not be used in global ORDER clause
explain (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; explain extended (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 ALL NULL NULL NULL NULL 4 1 PRIMARY t1 ALL NULL NULL NULL NULL 4
2 UNION t2 ALL NULL NULL NULL NULL 4 Using filesort 2 UNION t2 ALL NULL NULL NULL NULL 4 Using filesort
Warnings:
Note 1003 (select high_priority test.t1.a AS `a`,test.t1.b AS `b` from test.t1 limit 2) union all (select test.t2.a AS `a`,test.t2.b AS `b` from test.t2 order by test.t2.a limit 1) order by b desc
(select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2;
a b a b
1 a 1 a
...@@ -463,10 +465,12 @@ create table t1 (a int not null primary key auto_increment, b int, key(b)); ...@@ -463,10 +465,12 @@ create table t1 (a int not null primary key auto_increment, b int, key(b));
create table t2 (a int not null primary key auto_increment, b int); create table t2 (a int not null primary key auto_increment, b int);
insert into t1 (b) values (1),(2),(2),(3); insert into t1 (b) values (1),(2),(2),(3);
insert into t2 (b) values (10),(11),(12),(13); insert into t2 (b) values (10),(11),(12),(13);
explain (select * from t1 where a=1) union (select * from t2 where a=1); explain extended (select * from t1 where a=1) union (select * from t2 where a=1);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1 1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1
2 UNION t2 const PRIMARY PRIMARY 4 const 1 2 UNION t2 const PRIMARY PRIMARY 4 const 1
Warnings:
Note 1003 (select high_priority test.t1.a AS `a`,test.t1.b AS `b` from test.t1 where (test.t1.a = 1)) union (select test.t2.a AS `a`,test.t2.b AS `b` from test.t2 where (test.t2.a = 1))
(select * from t1 where a=5) union (select * from t2 where a=1); (select * from t1 where a=5) union (select * from t2 where a=1);
a b a b
1 10 1 10
......
mysql-test/t/subselect.test
View file @ a7bdd197
This diff is collapsed.
mysql-test/t/union.test
View file @ a7bdd197
...@@ -25,7 +25,7 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g ...@@ -25,7 +25,7 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g
(select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc;
--error 1249 --error 1249
(select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b; (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b;
explain (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc; explain extended (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc;
(select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2; (select sql_calc_found_rows a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 2;
select found_rows(); select found_rows();
select sql_calc_found_rows a,b from t1 union all select a,b from t2 limit 2; select sql_calc_found_rows a,b from t1 union all select a,b from t2 limit 2;
...@@ -275,7 +275,7 @@ create table t2 (a int not null primary key auto_increment, b int); ...@@ -275,7 +275,7 @@ create table t2 (a int not null primary key auto_increment, b int);
insert into t1 (b) values (1),(2),(2),(3); insert into t1 (b) values (1),(2),(2),(3);
insert into t2 (b) values (10),(11),(12),(13); insert into t2 (b) values (10),(11),(12),(13);
explain (select * from t1 where a=1) union (select * from t2 where a=1); explain extended (select * from t1 where a=1) union (select * from t2 where a=1);
(select * from t1 where a=5) union (select * from t2 where a=1); (select * from t1 where a=5) union (select * from t2 where a=1);
(select * from t1 where a=5 and a=6) union (select * from t2 where a=1); (select * from t1 where a=5 and a=6) union (select * from t2 where a=1);
(select t1.a,t1.b from t1,t2 where t1.a=5) union (select * from t2 where a=1); (select t1.a,t1.b from t1,t2 where t1.a=5) union (select * from t2 where a=1);
......
sql/item.cc
View file @ a7bdd197
...@@ -86,6 +86,19 @@ Item::Item(THD *thd, Item &item): ...@@ -86,6 +86,19 @@ Item::Item(THD *thd, Item &item):
thd->free_list= this; thd->free_list= this;
} }
void Item::print_item_w_name(String *str)
{
print(str);
if (name)
{
str->append(" AS `");
str->append(name);
str->append('`');
}
}
// Constructor used by Item_field & Item_ref (see Item comment) // Constructor used by Item_field & Item_ref (see Item comment)
Item_ident::Item_ident(THD *thd, Item_ident &item): Item_ident::Item_ident(THD *thd, Item_ident &item):
Item(thd, item), Item(thd, item),
...@@ -441,12 +454,8 @@ String *Item_int::val_str(String *str) ...@@ -441,12 +454,8 @@ String *Item_int::val_str(String *str)
void Item_int::print(String *str) void Item_int::print(String *str)
{ {
if (!name) str_value.set(value, default_charset());
{ str->append(str_value);
str_value.set(value, default_charset());
name=str_value.c_ptr();
}
str->append(name);
} }
String *Item_uint::val_str(String *str) String *Item_uint::val_str(String *str)
...@@ -457,12 +466,8 @@ String *Item_uint::val_str(String *str) ...@@ -457,12 +466,8 @@ String *Item_uint::val_str(String *str)
void Item_uint::print(String *str) void Item_uint::print(String *str)
{ {
if (!name) str_value.set((ulonglong) value, default_charset());
{ str->append(str_value);
str_value.set((ulonglong) value, default_charset());
name=str_value.c_ptr();
}
str->append(name);
} }
...@@ -476,17 +481,9 @@ void Item_string::print(String *str) ...@@ -476,17 +481,9 @@ void Item_string::print(String *str)
{ {
str->append('_'); str->append('_');
str->append(collation.collation->csname); str->append(collation.collation->csname);
if (varbin) str->append('\'');
{ str->append(str_value);
str->append(' '); str->append('\'');
str->append(full_name());
}
else
{
str->append('\'');
str->append(full_name());
str->append('\'');
}
} }
bool Item_null::eq(const Item *item, bool binary_cmp) const bool Item_null::eq(const Item *item, bool binary_cmp) const
...@@ -785,7 +782,7 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current, ...@@ -785,7 +782,7 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
// store pointer on SELECT_LEX from wich item is dependent // store pointer on SELECT_LEX from wich item is dependent
item->depended_from= last; item->depended_from= last;
current->mark_as_dependent(last); current->mark_as_dependent(last);
if (thd->lex.describe) if (thd->lex.describe & DESCRIBE_EXTENDED)
{ {
char warn_buff[MYSQL_ERRMSG_SIZE]; char warn_buff[MYSQL_ERRMSG_SIZE];
sprintf(warn_buff, ER(ER_WARN_FIELD_RESOLVED), sprintf(warn_buff, ER(ER_WARN_FIELD_RESOLVED),
...@@ -1494,6 +1491,34 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference) ...@@ -1494,6 +1491,34 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
} }
void Item_ref::print(String *str)
{
if (ref && *ref)
(*ref)->print(str);
else
Item_ident::print(str);
}
void Item_ref_null_helper::print(String *str)
{
str->append("<ref_null_helper>(");
if (ref && *ref)
(*ref)->print(str);
else
str->append('?');
str->append(')');
}
void Item_null_helper::print(String *str)
{
str->append("<null_helper>(");
store->print(str);
str->append(')');
}
bool Item_default_value::eq(const Item *item, bool binary_cmp) const bool Item_default_value::eq(const Item *item, bool binary_cmp) const
{ {
return item->type() == DEFAULT_VALUE_ITEM && return item->type() == DEFAULT_VALUE_ITEM &&
...@@ -1715,6 +1740,34 @@ Item_cache* Item_cache::get_cache(Item_result type) ...@@ -1715,6 +1740,34 @@ Item_cache* Item_cache::get_cache(Item_result type)
} }
} }
void Item_cache::print(String *str)
{
str->append("<cache>(");
if (example)
example->print(str);
else
Item::print(str);
str->append(')');
}
void Item_cache_int::store(Item *item)
{
value= item->val_int_result();
null_value= item->null_value;
collation.set(item->collation);
}
void Item_cache_real::store(Item *item)
{
value= item->val_result();
null_value= item->null_value;
collation.set(item->collation);
}
void Item_cache_str::store(Item *item) void Item_cache_str::store(Item *item)
{ {
value_buff.set(buffer, sizeof(buffer), item->collation.collation); value_buff.set(buffer, sizeof(buffer), item->collation.collation);
...@@ -1765,6 +1818,7 @@ bool Item_cache_row::allocate(uint num) ...@@ -1765,6 +1818,7 @@ bool Item_cache_row::allocate(uint num)
bool Item_cache_row::setup(Item * item) bool Item_cache_row::setup(Item * item)
{ {
example= item;
if (!values && allocate(item->cols())) if (!values && allocate(item->cols()))
return 1; return 1;
for (uint i= 0; i < item_count; i++) for (uint i= 0; i < item_count; i++)
......
sql/item.h
View file @ a7bdd197
...@@ -174,6 +174,7 @@ public: ...@@ -174,6 +174,7 @@ public:
{ return decimals != NOT_FIXED_DEC ? (DBL_DIG+2+decimals_par) : DBL_DIG+8;} { return decimals != NOT_FIXED_DEC ? (DBL_DIG+2+decimals_par) : DBL_DIG+8;}
virtual bool const_item() const { return used_tables() == 0; } virtual bool const_item() const { return used_tables() == 0; }
virtual void print(String *str_arg) { str_arg->append(full_name()); } virtual void print(String *str_arg) { str_arg->append(full_name()); }
void print_item_w_name(String *);
virtual void update_used_tables() {} virtual void update_used_tables() {}
virtual void split_sum_func(Item **ref_pointer_array, List<Item> &fields) {} virtual void split_sum_func(Item **ref_pointer_array, List<Item> &fields) {}
virtual bool get_date(TIME *ltime,bool fuzzydate); virtual bool get_date(TIME *ltime,bool fuzzydate);
...@@ -307,6 +308,7 @@ public: ...@@ -307,6 +308,7 @@ public:
bool basic_const_item() const { return 1; } bool basic_const_item() const { return 1; }
Item *new_item() { return new Item_null(name); } Item *new_item() { return new Item_null(name); }
bool is_null() { return 1; } bool is_null() { return 1; }
void print(String *str) { str->append("NULL"); }
}; };
class Item_param :public Item class Item_param :public Item
...@@ -357,6 +359,7 @@ public: ...@@ -357,6 +359,7 @@ public:
String *query_val_str(String *str); String *query_val_str(String *str);
enum_field_types field_type() const { return MYSQL_TYPE_STRING; } enum_field_types field_type() const { return MYSQL_TYPE_STRING; }
Item *new_item() { return new Item_param(pos_in_query); } Item *new_item() { return new Item_param(pos_in_query); }
void print(String *str) { str->append('?'); }
}; };
class Item_int :public Item class Item_int :public Item
...@@ -449,11 +452,9 @@ public: ...@@ -449,11 +452,9 @@ public:
class Item_string :public Item class Item_string :public Item
{ {
bool varbin;
public: public:
Item_string(const char *str,uint length, Item_string(const char *str,uint length,
CHARSET_INFO *cs, Derivation dv= DERIVATION_COERCIBLE) CHARSET_INFO *cs, Derivation dv= DERIVATION_COERCIBLE)
:varbin(0)
{ {
collation.set(cs, dv); collation.set(cs, dv);
str_value.set(str,length,cs); str_value.set(str,length,cs);
...@@ -463,7 +464,6 @@ public: ...@@ -463,7 +464,6 @@ public:
} }
Item_string(const char *name_par, const char *str, uint length, Item_string(const char *name_par, const char *str, uint length,
CHARSET_INFO *cs, Derivation dv= DERIVATION_COERCIBLE) CHARSET_INFO *cs, Derivation dv= DERIVATION_COERCIBLE)
:varbin(0)
{ {
collation.set(cs, dv); collation.set(cs, dv);
str_value.set(str,length,cs); str_value.set(str,length,cs);
...@@ -497,7 +497,6 @@ public: ...@@ -497,7 +497,6 @@ public:
} }
String *const_string() { return &str_value; } String *const_string() { return &str_value; }
inline void append(char *str, uint length) { str_value.append(str, length); } inline void append(char *str, uint length) { str_value.append(str, length); }
inline void set_varbin_name(char *nm) { name= nm; varbin= 1; }
void print(String *str); void print(String *str);
}; };
...@@ -633,6 +632,7 @@ public: ...@@ -633,6 +632,7 @@ public:
(*ref)->save_in_field(result_field, no_conversions); (*ref)->save_in_field(result_field, no_conversions);
} }
Item *real_item() { return *ref; } Item *real_item() { return *ref; }
void print(String *str);
}; };
class Item_in_subselect; class Item_in_subselect;
...@@ -648,15 +648,7 @@ public: ...@@ -648,15 +648,7 @@ public:
longlong val_int(); longlong val_int();
String* val_str(String* s); String* val_str(String* s);
bool get_date(TIME *ltime, bool fuzzydate); bool get_date(TIME *ltime, bool fuzzydate);
void print(String *str) void print(String *str);
{
str->append("<ref_null_helper>(");
if (ref && *ref)
(*ref)->print(str);
else
str->append('?');
str->append(')');
}
}; };
class Item_null_helper :public Item_ref_null_helper class Item_null_helper :public Item_ref_null_helper
...@@ -668,12 +660,7 @@ public: ...@@ -668,12 +660,7 @@ public:
:Item_ref_null_helper(master, &store, table_name_par, field_name_par), :Item_ref_null_helper(master, &store, table_name_par, field_name_par),
store(item) store(item)
{} {}
void print(String *str) void print(String *str);
{
str->append("<null_helper>(");
store->print(str);
str->append(')');
}
}; };
/* /*
...@@ -855,14 +842,16 @@ public: ...@@ -855,14 +842,16 @@ public:
class Item_cache: public Item class Item_cache: public Item
{ {
protected:
Item *example;
table_map used_table_map; table_map used_table_map;
public: public:
Item_cache(): used_table_map(0) {fixed= 1; null_value= 1;} Item_cache(): example(0), used_table_map(0) {fixed= 1; null_value= 1;}
void set_used_tables(table_map map) { used_table_map= map; } void set_used_tables(table_map map) { used_table_map= map; }
virtual bool allocate(uint i) { return 0; }; virtual bool allocate(uint i) { return 0; };
virtual bool setup(Item *) { return 0; }; virtual bool setup(Item *item) { example= item; return 0; };
virtual void store(Item *)= 0; virtual void store(Item *)= 0;
void set_len_n_dec(uint32 max_len, uint8 dec) void set_len_n_dec(uint32 max_len, uint8 dec)
{ {
...@@ -872,6 +861,7 @@ public: ...@@ -872,6 +861,7 @@ public:
enum Type type() const { return CACHE_ITEM; } enum Type type() const { return CACHE_ITEM; }
static Item_cache* get_cache(Item_result type); static Item_cache* get_cache(Item_result type);
table_map used_tables() const { return used_table_map; } table_map used_tables() const { return used_table_map; }
void print(String *str);
}; };
class Item_cache_int: public Item_cache class Item_cache_int: public Item_cache
...@@ -880,12 +870,7 @@ class Item_cache_int: public Item_cache ...@@ -880,12 +870,7 @@ class Item_cache_int: public Item_cache
public: public:
Item_cache_int(): Item_cache() {} Item_cache_int(): Item_cache() {}
void store(Item *item) void store(Item *item);
{
value= item->val_int_result();
null_value= item->null_value;
collation.set(item->collation);
}
double val() { return (double) value; } double val() { return (double) value; }
longlong val_int() { return value; } longlong val_int() { return value; }
String* val_str(String *str) { str->set(value, default_charset()); return str; } String* val_str(String *str) { str->set(value, default_charset()); return str; }
...@@ -898,12 +883,7 @@ class Item_cache_real: public Item_cache ...@@ -898,12 +883,7 @@ class Item_cache_real: public Item_cache
public: public:
Item_cache_real(): Item_cache() {} Item_cache_real(): Item_cache() {}
void store(Item *item) void store(Item *item);
{
value= item->val_result();
null_value= item->null_value;
collation.set(item->collation);
}
double val() { return value; } double val() { return value; }
longlong val_int() { return (longlong) (value+(value > 0 ? 0.5 : -0.5)); } longlong val_int() { return (longlong) (value+(value > 0 ? 0.5 : -0.5)); }
String* val_str(String *str) String* val_str(String *str)
......
sql/item_cmpfunc.cc
View file @ a7bdd197
...@@ -112,6 +112,14 @@ longlong Item_func_not_all::val_int() ...@@ -112,6 +112,14 @@ longlong Item_func_not_all::val_int()
return (!null_value && value == 0) ? 1 : 0; return (!null_value && value == 0) ? 1 : 0;
} }
void Item_func_not_all::print(String *str)
{
if (show)
Item_func::print(str);
else
args[0]->print(str);
}
/* /*
Convert a constant expression or string to an integer. Convert a constant expression or string to an integer.
This is done when comparing DATE's of different formats and This is done when comparing DATE's of different formats and
......
sql/item_cmpfunc.h
View file @ a7bdd197
...@@ -160,10 +160,14 @@ class Item_func_not_all :public Item_func_not ...@@ -160,10 +160,14 @@ class Item_func_not_all :public Item_func_not
{ {
bool abort_on_null; bool abort_on_null;
public: public:
Item_func_not_all(Item *a) :Item_func_not(a), abort_on_null(0) {} bool show;
Item_func_not_all(Item *a) :Item_func_not(a), abort_on_null(0), show(0) {}
virtual void top_level_item() { abort_on_null= 1; } virtual void top_level_item() { abort_on_null= 1; }
bool top_level() { return abort_on_null; } bool top_level() { return abort_on_null; }
longlong val_int(); longlong val_int();
const char *func_name() const { return "<not>"; }
void print(String *str);
}; };
class Item_func_eq :public Item_bool_rowready_func2 class Item_func_eq :public Item_bool_rowready_func2
......
sql/item_subselect.cc
View file @ a7bdd197
...@@ -141,17 +141,28 @@ Item::Type Item_subselect::type() const ...@@ -141,17 +141,28 @@ Item::Type Item_subselect::type() const
return SUBSELECT_ITEM; return SUBSELECT_ITEM;
} }
void Item_subselect::fix_length_and_dec() void Item_subselect::fix_length_and_dec()
{ {
engine->fix_length_and_dec(0); engine->fix_length_and_dec(0);
} }
inline table_map Item_subselect::used_tables() const inline table_map Item_subselect::used_tables() const
{ {
return (table_map) (engine->dependent() ? 1L : return (table_map) (engine->dependent() ? 1L :
(engine->uncacheable() ? RAND_TABLE_BIT : 0L)); (engine->uncacheable() ? RAND_TABLE_BIT : 0L));
} }
void Item_subselect::print(String *str)
{
str->append('(');
engine->print(str);
str->append(')');
}
Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex) Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex)
:Item_subselect(), value(0) :Item_subselect(), value(0)
{ {
...@@ -164,17 +175,24 @@ Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex) ...@@ -164,17 +175,24 @@ Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex)
} }
Item_maxmin_subselect::Item_maxmin_subselect(st_select_lex *select_lex, Item_maxmin_subselect::Item_maxmin_subselect(st_select_lex *select_lex,
bool max) bool max_arg)
:Item_singlerow_subselect() :Item_singlerow_subselect()
{ {
DBUG_ENTER("Item_maxmin_subselect::Item_maxmin_subselect"); DBUG_ENTER("Item_maxmin_subselect::Item_maxmin_subselect");
init(select_lex, new select_max_min_finder_subselect(this, max)); max= max_arg;
init(select_lex, new select_max_min_finder_subselect(this, max_arg));
max_columns= 1; max_columns= 1;
maybe_null= 1; maybe_null= 1;
max_columns= 1; max_columns= 1;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
void Item_maxmin_subselect::print(String *str)
{
str->append(max?"<max>":"<min>");
Item_singlerow_subselect::print(str);
}
void Item_singlerow_subselect::reset() void Item_singlerow_subselect::reset()
{ {
null_value= 1; null_value= 1;
...@@ -217,7 +235,7 @@ Item_singlerow_subselect::select_transformer(JOIN *join) ...@@ -217,7 +235,7 @@ Item_singlerow_subselect::select_transformer(JOIN *join)
*/ */
substitution->walk(&Item::remove_dependence_processor, substitution->walk(&Item::remove_dependence_processor,
(byte *) select_lex->outer_select()); (byte *) select_lex->outer_select());
if (select_lex->where || select_lex->having) if (join->conds || join->having)
{ {
Item *cond; Item *cond;
if (!join->having) if (!join->having)
...@@ -337,6 +355,7 @@ String *Item_singlerow_subselect::val_str (String *str) ...@@ -337,6 +355,7 @@ String *Item_singlerow_subselect::val_str (String *str)
} }
} }
Item_exists_subselect::Item_exists_subselect(st_select_lex *select_lex): Item_exists_subselect::Item_exists_subselect(st_select_lex *select_lex):
Item_subselect() Item_subselect()
{ {
...@@ -351,6 +370,14 @@ Item_exists_subselect::Item_exists_subselect(st_select_lex *select_lex): ...@@ -351,6 +370,14 @@ Item_exists_subselect::Item_exists_subselect(st_select_lex *select_lex):
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
void Item_exists_subselect::print(String *str)
{
str->append("exists");
Item_subselect::print(str);
}
bool Item_in_subselect::test_limit(SELECT_LEX_UNIT *unit) bool Item_in_subselect::test_limit(SELECT_LEX_UNIT *unit)
{ {
if (unit->fake_select_lex && if (unit->fake_select_lex &&
...@@ -368,7 +395,7 @@ bool Item_in_subselect::test_limit(SELECT_LEX_UNIT *unit) ...@@ -368,7 +395,7 @@ bool Item_in_subselect::test_limit(SELECT_LEX_UNIT *unit)
Item_in_subselect::Item_in_subselect(Item * left_exp, Item_in_subselect::Item_in_subselect(Item * left_exp,
st_select_lex *select_lex): st_select_lex *select_lex):
Item_exists_subselect(), upper_not(0) Item_exists_subselect(), transformed(0), upper_not(0)
{ {
DBUG_ENTER("Item_in_subselect::Item_in_subselect"); DBUG_ENTER("Item_in_subselect::Item_in_subselect");
left_expr= left_exp; left_expr= left_exp;
...@@ -384,8 +411,9 @@ Item_in_subselect::Item_in_subselect(Item * left_exp, ...@@ -384,8 +411,9 @@ Item_in_subselect::Item_in_subselect(Item * left_exp,
Item_allany_subselect::Item_allany_subselect(Item * left_exp, Item_allany_subselect::Item_allany_subselect(Item * left_exp,
compare_func_creator fn, compare_func_creator fn,
st_select_lex *select_lex) st_select_lex *select_lex,
:Item_in_subselect() bool all_arg)
:Item_in_subselect(), all(all_arg)
{ {
DBUG_ENTER("Item_in_subselect::Item_in_subselect"); DBUG_ENTER("Item_in_subselect::Item_in_subselect");
left_expr= left_exp; left_expr= left_exp;
...@@ -758,6 +786,7 @@ Item_in_subselect::row_value_transformer(JOIN *join, ...@@ -758,6 +786,7 @@ Item_in_subselect::row_value_transformer(JOIN *join,
Item_subselect::trans_res Item_subselect::trans_res
Item_in_subselect::select_transformer(JOIN *join) Item_in_subselect::select_transformer(JOIN *join)
{ {
transformed= 1;
if (left_expr->cols() == 1) if (left_expr->cols() == 1)
return single_value_transformer(join, left_expr, return single_value_transformer(join, left_expr,
&Item_bool_func2::eq_creator); &Item_bool_func2::eq_creator);
...@@ -765,12 +794,82 @@ Item_in_subselect::select_transformer(JOIN *join) ...@@ -765,12 +794,82 @@ Item_in_subselect::select_transformer(JOIN *join)
} }
void Item_in_subselect::print(String *str)
{
if (transformed)
str->append("<exists>");
else
{
left_expr->print(str);
str->append(" in ");
}
Item_subselect::print(str);
}
Item_subselect::trans_res Item_subselect::trans_res
Item_allany_subselect::select_transformer(JOIN *join) Item_allany_subselect::select_transformer(JOIN *join)
{ {
transformed= 1;
if (upper_not)
upper_not->show= 1;
return single_value_transformer(join, left_expr, func); return single_value_transformer(join, left_expr, func);
} }
void Item_allany_subselect::print(String *str)
{
if (transformed)
str->append("<exists>");
else
{
left_expr->print(str);
str->append(' ');
if (all)
{
if (func == &Item_bool_func2::lt_creator)
str->append(">=");
else if (func == &Item_bool_func2::gt_creator)
str->append("<=");
else if (func == &Item_bool_func2::le_creator)
str->append('>');
else if (func == &Item_bool_func2::ge_creator)
str->append('<');
else if (func == &Item_bool_func2::eq_creator)
str->append("<>");
else if (func == &Item_bool_func2::ne_creator)
str->append('=');
else
{
DBUG_ASSERT(0); // Impossible
}
str->append(" all ");
}
else
{
if (func == &Item_bool_func2::lt_creator)
str->append('<');
else if (func == &Item_bool_func2::gt_creator)
str->append('>');
else if (func == &Item_bool_func2::le_creator)
str->append("<=");
else if (func == &Item_bool_func2::ge_creator)
str->append(">=");
else if (func == &Item_bool_func2::eq_creator)
str->append('=');
else if (func == &Item_bool_func2::ne_creator)
str->append("<>");
else
{
DBUG_ASSERT(0); // Impossible
}
str->append(" any ");
}
}
Item_subselect::print(str);
}
subselect_single_select_engine:: subselect_single_select_engine::
subselect_single_select_engine(st_select_lex *select, subselect_single_select_engine(st_select_lex *select,
select_subselect *result, select_subselect *result,
...@@ -1098,11 +1197,13 @@ uint subselect_single_select_engine::cols() ...@@ -1098,11 +1197,13 @@ uint subselect_single_select_engine::cols()
return select_lex->item_list.elements; return select_lex->item_list.elements;
} }
uint subselect_union_engine::cols() uint subselect_union_engine::cols()
{ {
return unit->first_select()->item_list.elements; return unit->first_select()->item_list.elements;
} }
bool subselect_single_select_engine::dependent() bool subselect_single_select_engine::dependent()
{ {
return select_lex->dependent; return select_lex->dependent;
...@@ -1113,16 +1214,19 @@ bool subselect_union_engine::dependent() ...@@ -1113,16 +1214,19 @@ bool subselect_union_engine::dependent()
return unit->dependent; return unit->dependent;
} }
bool subselect_single_select_engine::uncacheable() bool subselect_single_select_engine::uncacheable()
{ {
return select_lex->uncacheable; return select_lex->uncacheable;
} }
bool subselect_union_engine::uncacheable() bool subselect_union_engine::uncacheable()
{ {
return unit->uncacheable; return unit->uncacheable;
} }
void subselect_single_select_engine::exclude() void subselect_single_select_engine::exclude()
{ {
select_lex->master_unit()->exclude_level(); select_lex->master_unit()->exclude_level();
...@@ -1133,8 +1237,53 @@ void subselect_union_engine::exclude() ...@@ -1133,8 +1237,53 @@ void subselect_union_engine::exclude()
unit->exclude_level(); unit->exclude_level();
} }
void subselect_uniquesubquery_engine::exclude() void subselect_uniquesubquery_engine::exclude()
{ {
//this never should be called //this never should be called
DBUG_ASSERT(0); DBUG_ASSERT(0);
} }
void subselect_single_select_engine::print(String *str)
{
select_lex->print(thd, str);
}
void subselect_union_engine::print(String *str)
{
unit->print(str);
}
void subselect_uniquesubquery_engine::print(String *str)
{
str->append("<primary_index_lookup>(");
tab->ref.items[0]->print(str);
str->append(" in ");
str->append(tab->table->real_name);
if (cond)
{
str->append(" where ");
cond->print(str);
}
str->append(')');
}
void subselect_indexsubquery_engine::print(String *str)
{
str->append("<index_lookup>(");
tab->ref.items[0]->print(str);
str->append(" in ");
str->append(tab->table->real_name);
if (check_null)
str->append(" chicking NULL");
if (cond)
{
str->append(" where ");
cond->print(str);
}
str->append(')');
}
sql/item_subselect.h
View file @ a7bdd197
...@@ -85,13 +85,7 @@ public: ...@@ -85,13 +85,7 @@ public:
bool exec(); bool exec();
virtual void fix_length_and_dec(); virtual void fix_length_and_dec();
table_map used_tables() const; table_map used_tables() const;
void print(String *str) void print(String *str);
{
if (name)
str->append(name);
else
str->append("-subselect-");
}
bool change_engine(subselect_engine *eng) bool change_engine(subselect_engine *eng)
{ {
engine= eng; engine= eng;
...@@ -138,8 +132,10 @@ public: ...@@ -138,8 +132,10 @@ public:
/* used in static ALL/ANY optimisation */ /* used in static ALL/ANY optimisation */
class Item_maxmin_subselect: public Item_singlerow_subselect class Item_maxmin_subselect: public Item_singlerow_subselect
{ {
bool max;
public: public:
Item_maxmin_subselect(st_select_lex *select_lex, bool max); Item_maxmin_subselect(st_select_lex *select_lex, bool max);
void print(String *str);
}; };
/* exists subselect */ /* exists subselect */
...@@ -164,6 +160,7 @@ public: ...@@ -164,6 +160,7 @@ public:
double val(); double val();
String *val_str(String*); String *val_str(String*);
void fix_length_and_dec(); void fix_length_and_dec();
void print(String *str);
friend class select_exists_subselect; friend class select_exists_subselect;
friend class subselect_uniquesubquery_engine; friend class subselect_uniquesubquery_engine;
...@@ -184,12 +181,15 @@ protected: ...@@ -184,12 +181,15 @@ protected:
Item_in_optimizer *optimizer; Item_in_optimizer *optimizer;
bool was_null; bool was_null;
bool abort_on_null; bool abort_on_null;
bool transformed;
public: public:
Item_func_not_all *upper_not; // point on NOT before ALL subquery Item_func_not_all *upper_not; // point on NOT before ALL subquery
Item_in_subselect(Item * left_expr, st_select_lex *select_lex); Item_in_subselect(Item * left_expr, st_select_lex *select_lex);
Item_in_subselect() Item_in_subselect()
:Item_exists_subselect(), abort_on_null(0), upper_not(0) {} :Item_exists_subselect(), abort_on_null(0), transformed(0), upper_not(0)
{}
subs_type substype() { return IN_SUBS; } subs_type substype() { return IN_SUBS; }
void reset() void reset()
...@@ -209,6 +209,7 @@ public: ...@@ -209,6 +209,7 @@ public:
String *val_str(String*); String *val_str(String*);
void top_level_item() { abort_on_null=1; } void top_level_item() { abort_on_null=1; }
bool test_limit(st_select_lex_unit *unit); bool test_limit(st_select_lex_unit *unit);
void print(String *str);
friend class Item_ref_null_helper; friend class Item_ref_null_helper;
friend class Item_is_not_null_test; friend class Item_is_not_null_test;
...@@ -223,12 +224,15 @@ protected: ...@@ -223,12 +224,15 @@ protected:
compare_func_creator func; compare_func_creator func;
public: public:
bool all;
Item_allany_subselect(Item * left_expr, compare_func_creator f, Item_allany_subselect(Item * left_expr, compare_func_creator f,
st_select_lex *select_lex); st_select_lex *select_lex, bool all);
// only ALL subquery has upper not // only ALL subquery has upper not
subs_type substype() { return upper_not?ALL_SUBS:ANY_SUBS; } subs_type substype() { return upper_not?ALL_SUBS:ANY_SUBS; }
trans_res select_transformer(JOIN *join); trans_res select_transformer(JOIN *join);
void print(String *str);
}; };
...@@ -264,6 +268,7 @@ public: ...@@ -264,6 +268,7 @@ public:
enum Item_result type() { return res_type; } enum Item_result type() { return res_type; }
virtual void exclude()= 0; virtual void exclude()= 0;
bool may_be_null() { return maybe_null; }; bool may_be_null() { return maybe_null; };
virtual void print(String *str)= 0;
}; };
...@@ -285,6 +290,7 @@ public: ...@@ -285,6 +290,7 @@ public:
bool dependent(); bool dependent();
bool uncacheable(); bool uncacheable();
void exclude(); void exclude();
void print (String *str);
}; };
...@@ -302,6 +308,7 @@ public: ...@@ -302,6 +308,7 @@ public:
bool dependent(); bool dependent();
bool uncacheable(); bool uncacheable();
void exclude(); void exclude();
void print (String *str);
}; };
...@@ -328,6 +335,7 @@ public: ...@@ -328,6 +335,7 @@ public:
bool dependent() { return 1; } bool dependent() { return 1; }
bool uncacheable() { return 1; } bool uncacheable() { return 1; }
void exclude(); void exclude();
void print (String *str);
}; };
...@@ -344,4 +352,5 @@ public: ...@@ -344,4 +352,5 @@ public:
check_null(chk_null) check_null(chk_null)
{} {}
int exec(); int exec();
void print (String *str);
}; };
sql/mysql_priv.h
View file @ a7bdd197
...@@ -186,6 +186,9 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; ...@@ -186,6 +186,9 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
#define OPTION_QUOTE_SHOW_CREATE OPTION_QUICK*2 #define OPTION_QUOTE_SHOW_CREATE OPTION_QUICK*2
#define OPTION_INTERNAL_SUBTRANSACTIONS OPTION_QUOTE_SHOW_CREATE*2 #define OPTION_INTERNAL_SUBTRANSACTIONS OPTION_QUOTE_SHOW_CREATE*2
/* options for UNION set by the yacc parser (stored in unit->union_option) */
#define UNION_ALL 1
/* Set if we are updating a non-transaction safe table */ /* Set if we are updating a non-transaction safe table */
#define OPTION_STATUS_NO_TRANS_UPDATE OPTION_INTERNAL_SUBTRANSACTIONS*2 #define OPTION_STATUS_NO_TRANS_UPDATE OPTION_INTERNAL_SUBTRANSACTIONS*2
......
sql/sql_derived.cc
View file @ a7bdd197
...@@ -222,10 +222,6 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, ...@@ -222,10 +222,6 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
else else
unit->exclude_level(); unit->exclude_level();
org_table_list->db= (char *)""; org_table_list->db= (char *)"";
#ifndef DBUG_OFF
/* Try to catch errors if this is accessed */
org_table_list->derived=(SELECT_LEX_UNIT *) 1;
#endif
// Force read of table stats in the optimizer // Force read of table stats in the optimizer
table->file->info(HA_STATUS_VARIABLE); table->file->info(HA_STATUS_VARIABLE);
} }
......
sql/sql_lex.cc
View file @ a7bdd197
...@@ -1421,7 +1421,73 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) ...@@ -1421,7 +1421,73 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num)
order_group_num)* 5)) == 0; order_group_num)* 5)) == 0;
} }
void st_select_lex_unit::print(String *str)
{
for (SELECT_LEX *sl= first_select(); sl; sl= sl->next_select())
{
if (sl != first_select())
{
str->append(" union ");
if (union_option & UNION_ALL)
str->append("all ");
}
if (sl->braces)
str->append('(');
sl->print(thd, str);
if (sl->braces)
str->append(')');
}
if (fake_select_lex == global_parameters)
{
if (fake_select_lex->order_list.elements)
{
str->append(" order by ");
fake_select_lex->print_order(str,
(ORDER *) fake_select_lex->
order_list.first);
}
fake_select_lex->print_limit(thd, str);
}
}
void st_select_lex::print_order(String *str, ORDER *order)
{
for (; order; order= order->next)
{
(*order->item)->print(str);
if (!order->asc)
str->append(" desc");
if (order->next)
str->append(',');
}
}
void st_select_lex::print_limit(THD *thd, String *str)
{
if (!thd)
thd= current_thd;
if (select_limit != thd->variables.select_limit ||
select_limit != HA_POS_ERROR ||
offset_limit != 0L)
{
str->append(" limit ");
char buff[21];
snprintf(buff, 21, "%ld", select_limit);
str->append(buff);
if (offset_limit)
{
str->append(',');
snprintf(buff, 21, "%ld", offset_limit);
str->append(buff);
}
}
}
/* /*
There are st_select_lex::add_table_to_list & There are st_select_lex::add_table_to_list &
st_select_lex::set_lock_for_tables in sql_parse.cc st_select_lex::set_lock_for_tables in sql_parse.cc
st_select_lex::print is in sql_select.h
*/ */
sql/sql_lex.h
View file @ a7bdd197
...@@ -79,6 +79,10 @@ enum enum_sql_command { ...@@ -79,6 +79,10 @@ enum enum_sql_command {
SQLCOM_END SQLCOM_END
}; };
// describe/explain types
#define DESCRIBE_NORMAL 1
#define DESCRIBE_EXTENDED 2
typedef List<Item> List_item; typedef List<Item> List_item;
typedef struct st_lex_master_info typedef struct st_lex_master_info
...@@ -321,7 +325,9 @@ public: ...@@ -321,7 +325,9 @@ public:
int prepare(THD *thd, select_result *result, bool tables_and_fields_initied); int prepare(THD *thd, select_result *result, bool tables_and_fields_initied);
int exec(); int exec();
int cleanup(); int cleanup();
void print(String *str);
friend void mysql_init_query(THD *thd); friend void mysql_init_query(THD *thd);
friend int subselect_union_engine::exec(); friend int subselect_union_engine::exec();
private: private:
...@@ -462,6 +468,9 @@ public: ...@@ -462,6 +468,9 @@ public:
init_select(); init_select();
} }
bool setup_ref_array(THD *thd, uint order_group_num); bool setup_ref_array(THD *thd, uint order_group_num);
void print(THD *thd, String *str);
static void print_order(String *str, ORDER *order);
void print_limit(THD *thd, String *str);
}; };
typedef class st_select_lex SELECT_LEX; typedef class st_select_lex SELECT_LEX;
...@@ -535,9 +544,10 @@ typedef struct st_lex ...@@ -535,9 +544,10 @@ typedef struct st_lex
uint fk_delete_opt, fk_update_opt, fk_match_option; uint fk_delete_opt, fk_update_opt, fk_match_option;
uint param_count; uint param_count;
uint slave_thd_opt; uint slave_thd_opt;
uint8 describe;
bool drop_primary, drop_if_exists, drop_temporary, local_file; bool drop_primary, drop_if_exists, drop_temporary, local_file;
bool in_comment, ignore_space, verbose, simple_alter, no_write_to_binlog; bool in_comment, ignore_space, verbose, simple_alter, no_write_to_binlog;
bool derived_tables, describe; bool derived_tables;
bool safe_to_cache_query; bool safe_to_cache_query;
st_lex() {} st_lex() {}
inline void uncacheable() inline void uncacheable()
......
sql/sql_parse.cc
View file @ a7bdd197
...@@ -1781,6 +1781,16 @@ mysql_execute_command(THD *thd) ...@@ -1781,6 +1781,16 @@ mysql_execute_command(THD *thd)
res= mysql_explain_union(thd, &thd->lex.unit, result); res= mysql_explain_union(thd, &thd->lex.unit, result);
MYSQL_LOCK *save_lock= thd->lock; MYSQL_LOCK *save_lock= thd->lock;
thd->lock= (MYSQL_LOCK *)0; thd->lock= (MYSQL_LOCK *)0;
if (lex->describe & DESCRIBE_EXTENDED)
{
char buff[1024];
String str(buff,(uint32) sizeof(buff), system_charset_info);
str.length(0);
thd->lex.unit.print(&str);
str.append('\0');
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_YES, str.ptr());
}
result->send_eof(); result->send_eof();
thd->lock= save_lock; thd->lock= save_lock;
} }
......
sql/sql_select.cc
View file @ a7bdd197
...@@ -328,6 +328,20 @@ JOIN::prepare(Item ***rref_pointer_array, ...@@ -328,6 +328,20 @@ JOIN::prepare(Item ***rref_pointer_array,
having->split_sum_func(ref_pointer_array, all_fields); having->split_sum_func(ref_pointer_array, all_fields);
} }
#ifndef DEBUG_OFF
{
char buff[256];
String str(buff,(uint32) sizeof(buff), system_charset_info);
str.length(0);
if (select_lex->master_unit()->item)
select_lex->master_unit()->item->print(&str);
else
unit->print(&str);
str.append('\0');
DBUG_PRINT("info", ("(SUB)SELECT: %s", str.ptr()));
}
#endif
// Is it subselect // Is it subselect
{ {
Item_subselect *subselect; Item_subselect *subselect;
...@@ -880,12 +894,12 @@ JOIN::optimize() ...@@ -880,12 +894,12 @@ JOIN::optimize()
need_tmp=1; simple_order=simple_group=0; // Force tmp table without sort need_tmp=1; simple_order=simple_group=0; // Force tmp table without sort
} }
tmp_having= having;
if (select_options & SELECT_DESCRIBE) if (select_options & SELECT_DESCRIBE)
{ {
error= 0; error= 0;
DBUG_RETURN(0); DBUG_RETURN(0);
} }
tmp_having= having;
having= 0; having= 0;
/* Perform FULLTEXT search before all regular searches */ /* Perform FULLTEXT search before all regular searches */
...@@ -1547,11 +1561,23 @@ mysql_select(THD *thd, Item ***rref_pointer_array, ...@@ -1547,11 +1561,23 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
goto err; // 1 goto err; // 1
} }
if (thd->lex.describe & DESCRIBE_EXTENDED)
{
join->conds_history= join->conds;
join->having_history= (join->having?join->having:join->tmp_having);
}
if (thd->net.report_error) if (thd->net.report_error)
goto err; goto err;
join->exec(); join->exec();
if (thd->lex.describe & DESCRIBE_EXTENDED)
{
select_lex->where= join->conds_history;
select_lex->having= join->having_history;
}
err: err:
if (free_join) if (free_join)
{ {
...@@ -8909,3 +8935,159 @@ int mysql_explain_select(THD *thd, SELECT_LEX *select_lex, char const *type, ...@@ -8909,3 +8935,159 @@ int mysql_explain_select(THD *thd, SELECT_LEX *select_lex, char const *type,
result, unit, select_lex, 0); result, unit, select_lex, 0);
DBUG_RETURN(res); DBUG_RETURN(res);
} }
void st_select_lex::print(THD *thd, String *str)
{
if (!thd)
thd= current_thd;
str->append("select ");
//options
if (options & SELECT_STRAIGHT_JOIN)
str->append("straight_join ");
if ((thd->lex.lock_option & TL_READ_HIGH_PRIORITY) &&
(this == &thd->lex.select_lex))
str->append("high_priority ");
if (options & SELECT_DISTINCT)
str->append("distinct ");
if (options & SELECT_SMALL_RESULT)
str->append("small_result ");
if (options & SELECT_BIG_RESULT)
str->append("big_result ");
if (options & OPTION_BUFFER_RESULT)
str->append("buffer_result ");
if (options & OPTION_FOUND_ROWS)
str->append("calc_found_rows ");
if (!thd->lex.safe_to_cache_query)
str->append("no_cache ");
if (options & OPTION_TO_QUERY_CACHE)
str->append("cache ");
//Item List
bool first= 1;
List_iterator_fast<Item> it(item_list);
Item *item;
while ((item= it++))
{
if (first)
first= 0;
else
str->append(',');
item->print_item_w_name(str);
}
/*
from clause
TODO: support USING/FORCE/IGNORE index
*/
if (table_list.elements)
{
str->append(" from ");
Item *next_on= 0;
for (TABLE_LIST *table= (TABLE_LIST *) table_list.first;
table;
table= table->next)
{
if (table->derived)
{
str->append('(');
table->derived->print(str);
str->append(") ");
str->append(table->alias);
}
else
{
str->append(table->db);
str->append('.');
str->append(table->real_name);
if (strcmp(table->real_name, table->alias))
{
str->append(' ');
str->append(table->alias);
}
}
if (table->on_expr && ((table->outer_join & JOIN_TYPE_LEFT) ||
!(table->outer_join & JOIN_TYPE_RIGHT)))
next_on= table->on_expr;
if (next_on)
{
str->append(" on(");
next_on->print(str);
str->append(')');
next_on= 0;
}
TABLE_LIST *next;
if ((next= table->next))
{
if (table->outer_join & JOIN_TYPE_RIGHT)
{
str->append(" right join ");
if (!(table->outer_join & JOIN_TYPE_LEFT) &&
table->on_expr)
next_on= table->on_expr;
}
else if (next->straight)
str->append(" straight_join ");
else if (next->outer_join & JOIN_TYPE_LEFT)
str->append(" left join ");
else
str->append(" join ");
}
}
}
//where
Item *where= this->where;
if (join)
where= join->conds;
if (where)
{
str->append(" where ");
where->print(str);
}
//group by & olap
if (group_list.elements)
{
str->append(" group by ");
print_order(str, (ORDER *) group_list.first);
switch (olap)
{
case CUBE_TYPE:
str->append(" with cube");
break;
case ROLLUP_TYPE:
str->append(" with rollup");
break;
default:
; //satisfy compiler
}
}
//having
Item *having= this->having;
if (join)
having= join->having;
if (having)
{
str->append(" having ");
having->print(str);
}
if (order_list.elements)
{
str->append(" order by ");
print_order(str, (ORDER *) order_list.first);
}
// limit
print_limit(thd, str);
// PROCEDURE unsupported here
}
sql/sql_select.h
View file @ a7bdd197
...@@ -151,7 +151,8 @@ class JOIN :public Sql_alloc ...@@ -151,7 +151,8 @@ class JOIN :public Sql_alloc
Item_sum **sum_funcs2, ***sum_funcs_end2; Item_sum **sum_funcs2, ***sum_funcs_end2;
Procedure *procedure; Procedure *procedure;
Item *having; Item *having;
Item *tmp_having; // To store Having when processed temporary table Item *tmp_having; // To store having when processed temporary table
Item *having_history; // Store having for explain
uint select_options; uint select_options;
select_result *result; select_result *result;
TMP_TABLE_PARAM tmp_table_param; TMP_TABLE_PARAM tmp_table_param;
...@@ -181,6 +182,7 @@ class JOIN :public Sql_alloc ...@@ -181,6 +182,7 @@ class JOIN :public Sql_alloc
ORDER *order, *group_list, *proc_param; //hold parameters of mysql_select ORDER *order, *group_list, *proc_param; //hold parameters of mysql_select
COND *conds; // ---"--- COND *conds; // ---"---
Item *conds_history; // store WHERE for explain
TABLE_LIST *tables_list; //hold 'tables' parameter of mysql_selec TABLE_LIST *tables_list; //hold 'tables' parameter of mysql_selec
SQL_SELECT *select; //created in optimisation phase SQL_SELECT *select; //created in optimisation phase
Item **ref_pointer_array; //used pointer reference for this select Item **ref_pointer_array; //used pointer reference for this select
...@@ -217,8 +219,7 @@ class JOIN :public Sql_alloc ...@@ -217,8 +219,7 @@ class JOIN :public Sql_alloc
thd= thd_arg; thd= thd_arg;
sum_funcs= sum_funcs2= 0; sum_funcs= sum_funcs2= 0;
procedure= 0; procedure= 0;
having= 0; having= tmp_having= having_history= 0;
tmp_having= 0;
select_options= select_options_arg; select_options= select_options_arg;
result= result_arg; result= result_arg;
lock= thd_arg->lock; lock= thd_arg->lock;
......
sql/sql_yacc.yy
View file @ a7bdd197
...@@ -704,6 +704,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -704,6 +704,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
union_clause union_list union_option union_clause union_list union_option
precision subselect_start opt_and charset precision subselect_start opt_and charset
subselect_end select_var_list select_var_list_init help opt_len subselect_end select_var_list select_var_list_init help opt_len
opt_extended_describe
END_OF_INPUT END_OF_INPUT
%type <NONE> %type <NONE>
...@@ -2263,7 +2264,7 @@ expr_expr: ...@@ -2263,7 +2264,7 @@ expr_expr:
| expr comp_op all_or_any in_subselect %prec EQ | expr comp_op all_or_any in_subselect %prec EQ
{ {
Item_allany_subselect *it= Item_allany_subselect *it=
new Item_allany_subselect($1, (*$2)($3), $4); new Item_allany_subselect($1, (*$2)($3), $4, $3);
if ($3) if ($3)
$$ = it->upper_not= new Item_func_not_all(it); /* ALL */ $$ = it->upper_not= new Item_func_not_all(it); /* ALL */
else else
...@@ -2309,7 +2310,7 @@ no_in_expr: ...@@ -2309,7 +2310,7 @@ no_in_expr:
| no_in_expr comp_op all_or_any in_subselect %prec EQ | no_in_expr comp_op all_or_any in_subselect %prec EQ
{ {
Item_allany_subselect *it= Item_allany_subselect *it=
new Item_allany_subselect($1, (*$2)($3), $4); new Item_allany_subselect($1, (*$2)($3), $4, $3);
if ($3) if ($3)
$$ = it->upper_not= new Item_func_not_all(it); /* ALL */ $$ = it->upper_not= new Item_func_not_all(it); /* ALL */
else else
...@@ -2364,7 +2365,7 @@ no_and_expr: ...@@ -2364,7 +2365,7 @@ no_and_expr:
| no_and_expr comp_op all_or_any in_subselect %prec EQ | no_and_expr comp_op all_or_any in_subselect %prec EQ
{ {
Item_allany_subselect *it= Item_allany_subselect *it=
new Item_allany_subselect($1, (*$2)($3), $4); new Item_allany_subselect($1, (*$2)($3), $4, $3);
if ($3) if ($3)
$$ = it->upper_not= new Item_func_not_all(it); /* ALL */ $$ = it->upper_not= new Item_func_not_all(it); /* ALL */
else else
...@@ -4025,7 +4026,9 @@ describe: ...@@ -4025,7 +4026,9 @@ describe:
YYABORT; YYABORT;
} }
opt_describe_column {} opt_describe_column {}
| describe_command { Lex->describe=1; } select | describe_command opt_extended_describe
{ Lex->describe|= DESCRIBE_NORMAL; }
select
{ {
LEX *lex=Lex; LEX *lex=Lex;
lex->select_lex.options|= SELECT_DESCRIBE; lex->select_lex.options|= SELECT_DESCRIBE;
...@@ -4036,6 +4039,11 @@ describe_command: ...@@ -4036,6 +4039,11 @@ describe_command:
DESC DESC
| DESCRIBE; | DESCRIBE;
opt_extended_describe:
/* empty */ {}
| EXTENDED_SYM { Lex->describe|= DESCRIBE_EXTENDED; }
;
opt_describe_column: opt_describe_column:
/* empty */ {} /* empty */ {}
| text_string { Lex->wild= $1; } | text_string { Lex->wild= $1; }
...@@ -4291,11 +4299,9 @@ literal: ...@@ -4291,11 +4299,9 @@ literal:
{ {
Item *tmp= new Item_varbinary($2.str,$2.length); Item *tmp= new Item_varbinary($2.str,$2.length);
String *str= tmp ? tmp->val_str((String*) 0) : (String*) 0; String *str= tmp ? tmp->val_str((String*) 0) : (String*) 0;
Item_string *item = new Item_string(str ? str->ptr() : "", $$= new Item_string(str ? str->ptr() : "",
str ? str->length() : str ? str->length() : 0,
0, Lex->charset); Lex->charset);
item->set_varbin_name(tmp->name);
$$= item;
} }
| DATE_SYM text_literal { $$ = $2; } | DATE_SYM text_literal { $$ = $2; }
| TIME_SYM text_literal { $$ = $2; } | TIME_SYM text_literal { $$ = $2; }
...@@ -5349,7 +5355,7 @@ order_or_limit: ...@@ -5349,7 +5355,7 @@ order_or_limit:
union_option: union_option:
/* empty */ {} /* empty */ {}
| ALL {Select->master_unit()->union_option= 1;}; | ALL {Select->master_unit()->union_option|= UNION_ALL;};
singlerow_subselect: singlerow_subselect:
subselect_start singlerow_subselect_init subselect_start singlerow_subselect_init
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7