database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merging

Browse Source 
mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2002-12-31 12:55:03 +02:00
parent a83a0d4b32 3ab0ddc294
commit 53894481bf
31 changed files with 351 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mysql-test/r/subselect.result
View File

@@ -1,13 +1,32 @@
select (select 2); select (select 2);
(select 2) (select 2)
2 2
explain select (select 2);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings:
Note 1247 Select 2 was reduced during optimisation
SELECT (SELECT 1) UNION SELECT (SELECT 2); SELECT (SELECT 1) UNION SELECT (SELECT 2);
(SELECT 1) (SELECT 1)
1 1
2 2
explain SELECT (SELECT 1) UNION SELECT (SELECT 2);
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used
3 UNION NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings:
Note 1247 Select 2 was reduced during optimisation
Note 1247 Select 4 was reduced during optimisation
SELECT (SELECT (SELECT 0 UNION SELECT 0)); SELECT (SELECT (SELECT 0 UNION SELECT 0));
(SELECT (SELECT 0 UNION SELECT 0)) (SELECT (SELECT 0 UNION SELECT 0))
0 0
explain SELECT (SELECT (SELECT 0 UNION SELECT 0));
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used
3 SUBSELECT NULL NULL NULL NULL NULL NULL NULL No tables used
4 UNION NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings:
Note 1247 Select 2 was reduced during optimisation
SELECT (SELECT 1 FROM (SELECT 1) as b HAVING a=1) as a; SELECT (SELECT 1 FROM (SELECT 1) as b HAVING a=1) as a;
Reference 'a' not supported (forward reference in item list) Reference 'a' not supported (forward reference in item list)
SELECT (SELECT 1 FROM (SELECT 1) as b HAVING b=1) as a,(SELECT 1 FROM (SELECT 1) as c HAVING a=1) as b; SELECT (SELECT 1 FROM (SELECT 1) as b HAVING b=1) as a,(SELECT 1 FROM (SELECT 1) as c HAVING a=1) as b;
@@ -20,8 +39,9 @@ Reference 'a' not supported (forward reference in item list)
EXPLAIN SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; EXPLAIN SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT 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 <derived2> system NULL NULL NULL NULL 1 1 PRIMARY <derived2> system NULL NULL NULL NULL 1
3 DEPENDENT SUBSELECT NULL NULL NULL NULL NULL NULL NULL No tables used
2 DERIVED NULL NULL NULL NULL NULL NULL NULL No tables used 2 DERIVED NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings:
Note 1247 Select 3 was reduced during optimisation
SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1;
1 1
1 1
@@ -629,6 +649,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t ref id id 5 const 1 Using where; Using index 1 PRIMARY t ref id id 5 const 1 Using where; Using index
3 SUBSELECT NULL NULL NULL NULL NULL NULL NULL No tables used 3 SUBSELECT NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings: Warnings:
Note 1247 Select 3 was reduced during optimisation
Note 1247 Select 2 was reduced during optimisation Note 1247 Select 2 was reduced during optimisation
EXPLAIN SELECT * FROM t WHERE id IN (SELECT 1 UNION SELECT 3); EXPLAIN SELECT * FROM t WHERE id IN (SELECT 1 UNION SELECT 3);
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
@@ -752,6 +773,16 @@ NULL
select 10.5 > ANY (SELECT * from t); select 10.5 > ANY (SELECT * from t);
10.5 > ANY (SELECT * from t) 10.5 > ANY (SELECT * from t)
1 1
explain select (select a+1) from t;
id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t ALL NULL NULL NULL NULL 3
Warnings:
Note 1247 Select 2 was reduced during optimisation
select (select a+1) from t;
(select a+1)
2.5
NULL
4.5
drop table t; drop table t;
create table t (a float); create table t (a float);
select 10.5 IN (SELECT * from t LIMIT 1); select 10.5 IN (SELECT * from t LIMIT 1);

9
mysql-test/t/subselect.test
View File

@@ -1,6 +1,9 @@
select (select 2); select (select 2);
explain select (select 2);
SELECT (SELECT 1) UNION SELECT (SELECT 2); SELECT (SELECT 1) UNION SELECT (SELECT 2);
explain SELECT (SELECT 1) UNION SELECT (SELECT 2);
SELECT (SELECT (SELECT 0 UNION SELECT 0)); SELECT (SELECT (SELECT 0 UNION SELECT 0));
explain SELECT (SELECT (SELECT 0 UNION SELECT 0));
-- error 1245 -- error 1245
SELECT (SELECT 1 FROM (SELECT 1) as b HAVING a=1) as a; SELECT (SELECT 1 FROM (SELECT 1) as b HAVING a=1) as a;
-- error 1245 -- error 1245
@@ -424,6 +427,8 @@ select 1.5 > ALL (SELECT * from t);
select 10.5 > ALL (SELECT * from t); select 10.5 > ALL (SELECT * from t);
select 1.5 > ANY (SELECT * from t); select 1.5 > ANY (SELECT * from t);
select 10.5 > ANY (SELECT * from t); select 10.5 > ANY (SELECT * from t);
explain select (select a+1) from t;
select (select a+1) from t;
drop table t; drop table t;
#LIMIT is not supported now #LIMIT is not supported now
@@ -432,7 +437,9 @@ create table t (a float);
select 10.5 IN (SELECT * from t LIMIT 1); select 10.5 IN (SELECT * from t LIMIT 1);
-- error 1235 -- error 1235
select 10.5 IN (SELECT * from t LIMIT 1 UNION SELECT 1.5); select 10.5 IN (SELECT * from t LIMIT 1 UNION SELECT 1.5);
drop table t;create table t1 (a int, b int, c varchar(10)); drop table t;
create table t1 (a int, b int, c varchar(10));
create table t2 (a int); create table t2 (a int);
insert into t1 values (1,2,'a'),(2,3,'b'),(3,4,'c'); insert into t1 values (1,2,'a'),(2,3,'b'),(3,4,'c');
insert into t2 values (1),(2),(NULL); insert into t2 values (1),(2),(NULL);

2
sql/filesort.cc
View File

@@ -496,7 +496,7 @@ static void make_sortkey(register SORTPARAM *param,
length=sort_field->length; length=sort_field->length;
} }
#ifdef USE_STRCOLL #ifdef USE_STRCOLL
if(use_strnxfrm(cs)) if (use_strnxfrm(cs))
{ {
if (item->binary()) if (item->binary())
{ {

38
sql/gstream.cc
View File

@@ -3,36 +3,38 @@
int GTextReadStream::get_next_toc_type() const int GTextReadStream::get_next_toc_type() const
{ {
const char *cur = m_cur; const char *cur = m_cur;
while((*cur)&&(strchr(" \t\r\n",*cur))) while ((*cur)&&(strchr(" \t\r\n",*cur)))
{ {
cur++; cur++;
} }
if(!(*cur)) if (!(*cur))
{ {
return eostream; return eostream;
} }
if(((*cur>='a') && (*cur<='z')) || ((*cur>='A') && (*cur<='Z')) || (*cur=='_')) if (((*cur>='a') && (*cur<='z')) || ((*cur>='A') && (*cur<='Z')) ||
(*cur=='_'))
{ {
return word; return word;
} }
if(((*cur>='0') && (*cur<='9')) || (*cur=='-') || (*cur=='+') || (*cur=='.')) if (((*cur>='0') && (*cur<='9')) || (*cur=='-') || (*cur=='+') ||
(*cur=='.'))
{ {
return numeric; return numeric;
} }
if(*cur == '(') if (*cur == '(')
{ {
return l_bra; return l_bra;
} }
if(*cur == ')') if (*cur == ')')
{ {
return r_bra; return r_bra;
} }
if(*cur == ',') if (*cur == ',')
{ {
return comma; return comma;
} }
@@ -43,28 +45,28 @@ int GTextReadStream::get_next_toc_type() const
const char *GTextReadStream::get_next_word(int *word_len) const char *GTextReadStream::get_next_word(int *word_len)
{ {
const char *cur = m_cur; const char *cur = m_cur;
while((*cur)&&(strchr(" \t\r\n",*cur))) while ((*cur)&&(strchr(" \t\r\n",*cur)))
{ {
cur++; cur++;
} }
m_last_text_position = cur; m_last_text_position = cur;
if(!(*cur)) if (!(*cur))
{ {
return 0; return 0;
} }
const char *wd_start = cur; const char *wd_start = cur;
if(((*cur<'a') || (*cur>'z')) && ((*cur<'A') || (*cur>'Z')) && (*cur!='_')) if (((*cur<'a') || (*cur>'z')) && ((*cur<'A') || (*cur>'Z')) && (*cur!='_'))
{ {
return NULL; return NULL;
} }
++cur; ++cur;
while(((*cur>='a') && (*cur<='z')) || ((*cur>='A') && (*cur<='Z')) || (*cur=='_') || while (((*cur>='a') && (*cur<='z')) || ((*cur>='A') && (*cur<='Z')) ||
((*cur>='0') && (*cur<='9'))) (*cur=='_') || ((*cur>='0') && (*cur<='9')))
{ {
++cur; ++cur;
} }
@@ -79,19 +81,19 @@ const char *GTextReadStream::get_next_word(int *word_len)
int GTextReadStream::get_next_number(double *d) int GTextReadStream::get_next_number(double *d)
{ {
const char *cur = m_cur; const char *cur = m_cur;
while((*cur)&&(strchr(" \t\r\n",*cur))) while ((*cur)&&(strchr(" \t\r\n",*cur)))
{ {
cur++; cur++;
} }
m_last_text_position = cur; m_last_text_position = cur;
if(!(*cur)) if (!(*cur))
{ {
set_error_msg("Numeric constant expected"); set_error_msg("Numeric constant expected");
return 1; return 1;
} }
if(((*cur<'0') || (*cur>'9')) && (*cur!='-') && (*cur!='+') && (*cur!='.')) if (((*cur<'0') || (*cur>'9')) && (*cur!='-') && (*cur!='+') && (*cur!='.'))
{ {
set_error_msg("Numeric constant expected"); set_error_msg("Numeric constant expected");
return 1; return 1;
@@ -101,7 +103,7 @@ int GTextReadStream::get_next_number(double *d)
*d = strtod(cur, &endptr); *d = strtod(cur, &endptr);
if(endptr) if (endptr)
{ {
m_cur = endptr; m_cur = endptr;
} }
@@ -112,11 +114,11 @@ int GTextReadStream::get_next_number(double *d)
char GTextReadStream::get_next_symbol() char GTextReadStream::get_next_symbol()
{ {
const char *cur = m_cur; const char *cur = m_cur;
while((*cur)&&(strchr(" \t\r\n",*cur))) while ((*cur)&&(strchr(" \t\r\n",*cur)))
{ {
cur++; cur++;
} }
if(!(*cur)) if (!(*cur))
{ {
return 0; return 0;
} }

74
sql/item.cc
View File

@@ -502,18 +502,17 @@ bool Item_ref_on_list_position::fix_fields(THD *thd,
struct st_table_list *tables, struct st_table_list *tables,
Item ** reference) Item ** reference)
{ {
ref= 0;
List_iterator<Item> li(list); List_iterator<Item> li(list);
Item *item; Item *item;
uint i= 0; for (uint i= 0; (item= li++) && i < pos; i++);
for (; (item= li++) && i < pos; i++); if (item)
if (i == pos)
{ {
ref= li.ref(); ref= li.ref();
return Item_ref_null_helper::fix_fields(thd, tables, reference); return Item_ref_null_helper::fix_fields(thd, tables, reference);
} }
else else
{ {
ref= 0;
my_error(ER_CARDINALITY_COL, MYF(0), pos); my_error(ER_CARDINALITY_COL, MYF(0), pos);
return 1; return 1;
} }
@@ -546,8 +545,11 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
{ {
if (!field) // If field is not checked if (!field) // If field is not checked
{ {
Field *tmp; TABLE_LIST *where= 0;
if ((tmp= find_field_in_tables(thd, this, tables, 0)) == not_found_field) Field *tmp= (Field *)not_found_field;
if (outer_resolving ||
(tmp= find_field_in_tables(thd, this, tables, &where, 0)) ==
not_found_field)
{ {
/* /*
We can't find table field in table list of current select, We can't find table field in table list of current select,
@@ -564,12 +566,12 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
// Prevent using outer fields in subselects, that is not supported now // Prevent using outer fields in subselects, that is not supported now
SELECT_LEX *cursel=(SELECT_LEX *) thd->lex.current_select; SELECT_LEX *cursel=(SELECT_LEX *) thd->lex.current_select;
if (cursel->master_unit()->first_select()->linkage != DERIVED_TABLE_TYPE) if (cursel->master_unit()->first_select()->linkage != DERIVED_TABLE_TYPE)
for (SELECT_LEX *sl=cursel->outer_select(); for (SELECT_LEX *sl=(outer_resolving?cursel:cursel->outer_select());
sl; sl;
sl= sl->outer_select()) sl= sl->outer_select())
{ {
if ((tmp= find_field_in_tables(thd, this, if ((tmp= find_field_in_tables(thd, this,
(last= sl)->get_table_list(), (last= sl)->get_table_list(), &where,
0)) != not_found_field) 0)) != not_found_field)
break; break;
if ((refer= find_item_in_list(this, sl->item_list, if ((refer= find_item_in_list(this, sl->item_list,
@@ -587,7 +589,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
else if (tmp == not_found_field && refer == (Item **)not_found_item) else if (tmp == not_found_field && refer == (Item **)not_found_item)
{ {
// call to return error code // call to return error code
find_field_in_tables(thd, this, tables, 1); find_field_in_tables(thd, this, tables, &where, 1);
return -1; return -1;
} }
else if (refer != (Item **)not_found_item) else if (refer != (Item **)not_found_item)
@@ -612,6 +614,17 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
found table as depended (of select where was found table) found table as depended (of select where was found table)
*/ */
thd->lex.current_select->mark_as_dependent(last); thd->lex.current_select->mark_as_dependent(last);
if (depended_from->having_fix_field)
{
Item_ref *rf;
*ref= rf= new Item_ref((where->db[0]?where->db:0),
(char *)where->alias,
(char *)field_name);
if (!rf)
return 1;
(rf)->outer_resolving= outer_resolving;
return rf->check_cols(1) || rf->fix_fields(thd, tables, ref);
}
} }
} }
else if (!tmp) else if (!tmp)
@@ -627,14 +640,6 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
table->used_fields++; table->used_fields++;
table->used_keys&=field->part_of_key; table->used_keys&=field->part_of_key;
} }
if (depended_from != 0 && depended_from->having_fix_field)
{
*ref= new Item_ref((char *)db_name, (char *)table_name,
(char *)field_name);
if (!*ref)
return 1;
return (*ref)->check_cols(1) || (*ref)->fix_fields(thd, tables, ref);
}
fixed= 1; fixed= 1;
return 0; return 0;
} }
@@ -1005,13 +1010,17 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
{ {
if (!ref) if (!ref)
{ {
SELECT_LEX *sl= thd->lex.current_select->outer_select(); TABLE_LIST *where= 0;
SELECT_LEX *sl= (outer_resolving?
thd->lex.current_select->select_lex():
thd->lex.current_select->outer_select());
/* /*
Finding only in current select will be performed for selects that have Finding only in current select will be performed for selects that have
not outer one and for derived tables (which not support using outer not outer one and for derived tables (which not support using outer
fields for now) fields for now)
*/ */
if ((ref= find_item_in_list(this, if (outer_resolving ||
(ref= find_item_in_list(this,
*(thd->lex.current_select->get_item_list()), *(thd->lex.current_select->get_item_list()),
((sl && ((sl &&
thd->lex.current_select->master_unit()-> thd->lex.current_select->master_unit()->
@@ -1039,7 +1048,7 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference)
(Item **)not_found_item) (Item **)not_found_item)
break; break;
if ((tmp= find_field_in_tables(thd, this, if ((tmp= find_field_in_tables(thd, this,
sl->get_table_list(), sl->get_table_list(), &where,
0)) != not_found_field); 0)) != not_found_field);
if (sl->master_unit()->first_select()->linkage == if (sl->master_unit()->first_select()->linkage ==
DERIVED_TABLE_TYPE) DERIVED_TABLE_TYPE)
@@ -1268,29 +1277,20 @@ longlong Item_cache_str::val_int()
bool Item_cache_row::allocate(uint num) bool Item_cache_row::allocate(uint num)
{ {
n= num; item_count= num;
THD *thd= current_thd; THD *thd= current_thd;
if (!(values= (Item_cache **) thd->calloc(sizeof(Item_cache *)*n))) return (!(values=
{ (Item_cache **) thd->calloc(sizeof(Item_cache *)*item_count)));
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
thd->fatal_error= 1;
return 1;
}
return 0;
} }
bool Item_cache_row::setup(Item * item) bool Item_cache_row::setup(Item * item)
{ {
if (!values && allocate(item->cols())) if (!values && allocate(item->cols()))
return 1; return 1;
for(uint i= 0; i < n; i++) for (uint i= 0; i < item_count; i++)
{ {
if (!(values[i]= Item_cache::get_cache(item->el(i)->result_type()))) if (!(values[i]= Item_cache::get_cache(item->el(i)->result_type())))
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return 1; return 1;
}
values[i]->setup(item->el(i)); values[i]->setup(item->el(i));
} }
return 0; return 0;
@@ -1300,7 +1300,7 @@ void Item_cache_row::store(Item * item)
{ {
null_value= 0; null_value= 0;
item->bring_value(); item->bring_value();
for(uint i= 0; i < n; i++) for (uint i= 0; i < item_count; i++)
{ {
values[i]->store(item->el(i)); values[i]->store(item->el(i));
null_value|= values[i]->null_value; null_value|= values[i]->null_value;
@@ -1318,7 +1318,7 @@ void Item_cache_row::illegal_method_call(const char *method)
bool Item_cache_row::check_cols(uint c) bool Item_cache_row::check_cols(uint c)
{ {
if (c != n) if (c != item_count)
{ {
my_error(ER_CARDINALITY_COL, MYF(0), c); my_error(ER_CARDINALITY_COL, MYF(0), c);
return 1; return 1;
@@ -1328,7 +1328,7 @@ bool Item_cache_row::check_cols(uint c)
bool Item_cache_row::null_inside() bool Item_cache_row::null_inside()
{ {
for (uint i= 0; i < n; i++) for (uint i= 0; i < item_count; i++)
{ {
if (values[i]->cols() > 1) if (values[i]->cols() > 1)
{ {
@@ -1347,7 +1347,7 @@ bool Item_cache_row::null_inside()
void Item_cache_row::bring_value() void Item_cache_row::bring_value()
{ {
for (uint i= 0; i < n; i++) for (uint i= 0; i < item_count; i++)
values[i]->bring_value(); values[i]->bring_value();
return; return;
} }

13
sql/item.h
View File

@@ -96,6 +96,7 @@ public:
CHARSET_INFO *thd_charset() const; CHARSET_INFO *thd_charset() const;
CHARSET_INFO *charset() const { return str_value.charset(); }; CHARSET_INFO *charset() const { return str_value.charset(); };
void set_charset(CHARSET_INFO *cs) { str_value.set_charset(cs); } void set_charset(CHARSET_INFO *cs) { str_value.set_charset(cs); }
virtual void set_outer_resolving() {}
// Row emulation // Row emulation
virtual uint cols() { return 1; } virtual uint cols() { return 1; }
@@ -117,12 +118,14 @@ public:
const char *table_name; const char *table_name;
const char *field_name; const char *field_name;
st_select_lex *depended_from; st_select_lex *depended_from;
bool outer_resolving; /* used for items from reduced subselect */
Item_ident(const char *db_name_par,const char *table_name_par, Item_ident(const char *db_name_par,const char *table_name_par,
const char *field_name_par) const char *field_name_par)
:db_name(db_name_par),table_name(table_name_par), :db_name(db_name_par), table_name(table_name_par),
field_name(field_name_par), depended_from(0) field_name(field_name_par), depended_from(0), outer_resolving(0)
{ name = (char*) field_name_par; } { name = (char*) field_name_par; }
const char *full_name() const; const char *full_name() const;
void set_outer_resolving() { outer_resolving= 1; }
}; };
@@ -728,9 +731,9 @@ public:
class Item_cache_row: public Item_cache class Item_cache_row: public Item_cache
{ {
Item_cache **values; Item_cache **values;
uint n; uint item_count;
public: public:
Item_cache_row(): values(0), n(2) { fixed= 1; null_value= 1; } Item_cache_row(): values(0), item_count(2) { fixed= 1; null_value= 1; }
/* /*
'allocate' used only in row transformer, to preallocate space for row 'allocate' used only in row transformer, to preallocate space for row
@@ -765,7 +768,7 @@ public:
}; };
enum Item_result result_type() const { return ROW_RESULT; } enum Item_result result_type() const { return ROW_RESULT; }
uint cols() { return n; } uint cols() { return item_count; }
Item* el(uint i) { return values[i]; } Item* el(uint i) { return values[i]; }
Item** addr(uint i) { return (Item **) (values + i); } Item** addr(uint i) { return (Item **) (values + i); }
bool check_cols(uint c); bool check_cols(uint c);

46
sql/item_cmpfunc.cc
View File

@@ -153,12 +153,8 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
comparators[i].set_cmp_func(owner, (*a)->addr(i), (*b)->addr(i)); comparators[i].set_cmp_func(owner, (*a)->addr(i), (*b)->addr(i));
} }
else else
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return 1; return 1;
} }
}
return 0; return 0;
} }
@@ -276,11 +272,7 @@ int Arg_comparator::compare_e_row()
bool Item_in_optimizer::preallocate_row() bool Item_in_optimizer::preallocate_row()
{ {
if ((cache= Item_cache::get_cache(ROW_RESULT))) return (!(cache= Item_cache::get_cache(ROW_RESULT)));
return 0;
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return 1;
} }
bool Item_in_optimizer::fix_fields(THD *thd, struct st_table_list *tables, bool Item_in_optimizer::fix_fields(THD *thd, struct st_table_list *tables,
@@ -296,11 +288,7 @@ bool Item_in_optimizer::fix_fields(THD *thd, struct st_table_list *tables,
used_tables_cache= args[0]->used_tables(); used_tables_cache= args[0]->used_tables();
const_item_cache= args[0]->const_item(); const_item_cache= args[0]->const_item();
if (!cache && !(cache= Item_cache::get_cache(args[0]->result_type()))) if (!cache && !(cache= Item_cache::get_cache(args[0]->result_type())))
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
thd->fatal_error= 1;
return 1; return 1;
}
cache->setup(args[0]); cache->setup(args[0]);
if (args[1]->fix_fields(thd, tables, args)) if (args[1]->fix_fields(thd, tables, args))
return 1; return 1;
@@ -946,6 +934,13 @@ Item_func_case::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
return 0; return 0;
} }
void Item_func_case::set_outer_resolving()
{
first_expr->set_outer_resolving();
else_expr->set_outer_resolving();
Item_func::set_outer_resolving();
}
bool Item_func_case::check_loop(uint id) bool Item_func_case::check_loop(uint id)
{ {
DBUG_ENTER("Item_func_case::check_loop"); DBUG_ENTER("Item_func_case::check_loop");
@@ -1239,18 +1234,10 @@ void cmp_item_row::store_value(Item *item)
item->null_value|= item->el(i)->null_value; item->null_value|= item->el(i)->null_value;
} }
else else
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
thd->fatal_error= 1;
return; return;
} }
}
else else
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
thd->fatal_error= 1;
return; return;
}
} }
void cmp_item_row::store_value_by_template(cmp_item *t, Item *item) void cmp_item_row::store_value_by_template(cmp_item *t, Item *item)
@@ -1274,18 +1261,10 @@ void cmp_item_row::store_value_by_template(cmp_item *t, Item *item)
item->null_value|= item->el(i)->null_value; item->null_value|= item->el(i)->null_value;
} }
else else
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return; return;
} }
}
else else
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return; return;
}
} }
int cmp_item_row::cmp(Item *arg) int cmp_item_row::cmp(Item *arg)
@@ -1523,6 +1502,15 @@ bool Item_cond::check_loop(uint id)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
void Item_cond::set_outer_resolving()
{
Item_func::set_outer_resolving();
List_iterator<Item> li(list);
Item *item;
while ((item= li++))
item->set_outer_resolving();
}
void Item_cond::split_sum_func(List<Item> &fields) void Item_cond::split_sum_func(List<Item> &fields)
{ {
List_iterator<Item> li(list); List_iterator<Item> li(list);

16
sql/item_cmpfunc.h
View File

@@ -277,6 +277,11 @@ public:
const char *func_name() const { return "interval"; } const char *func_name() const { return "interval"; }
void update_used_tables(); void update_used_tables();
bool check_loop(uint id); bool check_loop(uint id);
void set_outer_resolving()
{
item->set_outer_resolving();
Item_func::set_outer_resolving();
}
}; };
@@ -359,6 +364,7 @@ public:
bool fix_fields(THD *thd, struct st_table_list *tlist, Item **ref); bool fix_fields(THD *thd, struct st_table_list *tlist, Item **ref);
Item *find_item(String *str); Item *find_item(String *str);
bool check_loop(uint id); bool check_loop(uint id);
void set_outer_resolving();
}; };
@@ -538,8 +544,8 @@ public:
cmp_item_row(): comparators(0), n(0) {} cmp_item_row(): comparators(0), n(0) {}
~cmp_item_row() ~cmp_item_row()
{ {
if(comparators) if (comparators)
for(uint i= 0; i < n; i++) for (uint i= 0; i < n; i++)
if (comparators[i]) if (comparators[i])
delete comparators[i]; delete comparators[i];
} }
@@ -643,6 +649,11 @@ class Item_func_in :public Item_int_func
DBUG_RETURN(item->check_loop(id)); DBUG_RETURN(item->check_loop(id));
} }
bool nulls_in_row(); bool nulls_in_row();
void set_outer_resolving()
{
item->set_outer_resolving();
Item_int_func::set_outer_resolving();
}
}; };
/* Functions used by where clause */ /* Functions used by where clause */
@@ -784,6 +795,7 @@ public:
friend int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds); friend int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds);
bool check_loop(uint id); bool check_loop(uint id);
void top_level_item() { abort_on_null=1; } void top_level_item() { abort_on_null=1; }
void set_outer_resolving();
}; };

19
sql/item_func.cc
View File

@@ -146,6 +146,16 @@ bool Item_func::check_loop(uint id)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
void Item_func::set_outer_resolving()
{
if (arg_count)
{
Item **arg,**arg_end;
for (arg= args, arg_end= args+arg_count; arg != arg_end; arg++)
(*arg)->set_outer_resolving();
}
}
void Item_func::split_sum_func(List<Item> &fields) void Item_func::split_sum_func(List<Item> &fields)
{ {
Item **arg,**arg_end; Item **arg,**arg_end;
@@ -2356,6 +2366,15 @@ bool Item_func_match::check_loop(uint id)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
void Item_func_match::set_outer_resolving()
{
Item_real_func::set_outer_resolving();
List_iterator<Item> li(fields);
Item *item;
while ((item= li++))
item->set_outer_resolving();
}
bool Item_func_match::fix_index() bool Item_func_match::fix_index()
{ {
List_iterator_fast<Item> li(fields); List_iterator_fast<Item> li(fields);

9
sql/item_func.h
View File

@@ -133,6 +133,7 @@ public:
friend class udf_handler; friend class udf_handler;
Field *tmp_table_field(TABLE *t_arg); Field *tmp_table_field(TABLE *t_arg);
bool check_loop(uint id); bool check_loop(uint id);
void set_outer_resolving();
}; };
@@ -632,6 +633,11 @@ public:
DBUG_RETURN(1); DBUG_RETURN(1);
DBUG_RETURN(item->check_loop(id)); DBUG_RETURN(item->check_loop(id));
} }
void set_outer_resolving()
{
item->set_outer_resolving();
Item_int_func::set_outer_resolving();
}
}; };
@@ -989,7 +995,7 @@ public:
{ {
ft_handler->please->close_search(ft_handler); ft_handler->please->close_search(ft_handler);
ft_handler=0; ft_handler=0;
if(join_key) if (join_key)
table->file->ft_handler=0; table->file->ft_handler=0;
table->fulltext_searched=0; table->fulltext_searched=0;
} }
@@ -1006,6 +1012,7 @@ public:
bool fix_index(); bool fix_index();
void init_search(bool no_order); void init_search(bool no_order);
bool check_loop(uint id); bool check_loop(uint id);
void set_outer_resolving();
}; };

17
sql/item_row.cc
View File

@@ -105,5 +105,20 @@ void Item_row::bring_value()
{ {
for (uint i= 0; i < arg_count; i++) for (uint i= 0; i < arg_count; i++)
items[i]->bring_value(); items[i]->bring_value();
return; }
void Item_row::set_outer_resolving()
{
for (uint i= 0; i < arg_count; i++)
items[i]->set_outer_resolving();
}
bool Item_row::check_loop(uint id)
{
if (Item::check_loop(id))
return 1;
for (uint i= 0; i < arg_count; i++)
if (items[i]->check_loop(id))
return 1;
return 0;
} }

4
sql/item_row.h
View File

@@ -33,7 +33,7 @@ public:
~Item_row() ~Item_row()
{ {
if(array_holder && items) if (array_holder && items)
sql_element_free(items); sql_element_free(items);
} }
@@ -64,6 +64,8 @@ public:
bool const_item() const { return const_item_cache; }; bool const_item() const { return const_item_cache; };
enum Item_result result_type() const { return ROW_RESULT; } enum Item_result result_type() const { return ROW_RESULT; }
void update_used_tables(); void update_used_tables();
bool check_loop(uint id);
void set_outer_resolving();
uint cols() { return arg_count; } uint cols() { return arg_count; }
Item* el(uint i) { return items[i]; } Item* el(uint i) { return items[i]; }

6
sql/item_strfunc.cc
View File

@@ -1961,7 +1961,7 @@ String *Item_func_conv_charset::val_str(String *str)
d0=d=(unsigned char*)str->ptr(); d0=d=(unsigned char*)str->ptr();
de=d+dmaxlen; de=d+dmaxlen;
while( s < se && d < de){ while (s < se && d < de){
cnvres=from->mb_wc(from,&wc,s,se); cnvres=from->mb_wc(from,&wc,s,se);
if (cnvres>0) if (cnvres>0)
@@ -2035,7 +2035,7 @@ String *Item_func_conv_charset3::val_str(String *str)
d0=d=(unsigned char*)str->ptr(); d0=d=(unsigned char*)str->ptr();
de=d+dmaxlen; de=d+dmaxlen;
while( s < se && d < de){ while (s < se && d < de){
cnvres=from_charset->mb_wc(from_charset,&wc,s,se); cnvres=from_charset->mb_wc(from_charset,&wc,s,se);
if (cnvres>0) if (cnvres>0)
@@ -2655,7 +2655,7 @@ String *Item_func_spatial_collection::val_str(String *str)
null_value=1; null_value=1;
str->length(0); str->length(0);
if(str->reserve(9,512)) if (str->reserve(9,512))
return 0; return 0;
str->q_append((char)Geometry::wkbNDR); str->q_append((char)Geometry::wkbNDR);

15
sql/item_strfunc.h
View File

@@ -116,6 +116,11 @@ public:
DBUG_RETURN(1); DBUG_RETURN(1);
DBUG_RETURN(separator->check_loop(id)); DBUG_RETURN(separator->check_loop(id));
} }
void set_outer_resolving()
{
separator->set_outer_resolving();
Item_func::set_outer_resolving();
}
}; };
class Item_func_reverse :public Item_str_func class Item_func_reverse :public Item_str_func
@@ -393,6 +398,11 @@ public:
DBUG_RETURN(1); DBUG_RETURN(1);
DBUG_RETURN(item->check_loop(id)); DBUG_RETURN(item->check_loop(id));
} }
void set_outer_resolving()
{
item->set_outer_resolving();
Item_str_func::set_outer_resolving();
}
}; };
@@ -421,6 +431,11 @@ public:
DBUG_RETURN(1); DBUG_RETURN(1);
DBUG_RETURN(item->check_loop(id)); DBUG_RETURN(item->check_loop(id));
} }
void set_outer_resolving()
{
item->set_outer_resolving();
Item_str_func::set_outer_resolving();
}
}; };

129
sql/item_subselect.cc
View File

@@ -32,6 +32,11 @@ SUBSELECT TODO:
#include "mysql_priv.h" #include "mysql_priv.h"
#include "sql_select.h" #include "sql_select.h"
inline Item * and_items(Item* cond, Item *item)
{
return (cond? (new Item_cond_and(cond, item)) : item);
}
Item_subselect::Item_subselect(): Item_subselect::Item_subselect():
Item_result_field(), engine_owner(1), value_assigned(0), substitution(0), Item_result_field(), engine_owner(1), value_assigned(0), substitution(0),
have_to_be_excluded(0) have_to_be_excluded(0)
@@ -51,7 +56,7 @@ void Item_subselect::init(THD *thd, st_select_lex *select_lex,
DBUG_ENTER("Item_subselect::init"); DBUG_ENTER("Item_subselect::init");
DBUG_PRINT("subs", ("select_lex 0x%xl", (ulong) select_lex)); DBUG_PRINT("subs", ("select_lex 0x%xl", (ulong) select_lex));
select_transformer(select_lex->master_unit()); select_transformer(thd, select_lex->master_unit());
if (select_lex->next_select()) if (select_lex->next_select())
engine= new subselect_union_engine(thd, select_lex->master_unit(), result, engine= new subselect_union_engine(thd, select_lex->master_unit(), result,
this); this);
@@ -67,7 +72,7 @@ Item_subselect::~Item_subselect()
delete engine; delete engine;
} }
void Item_subselect::select_transformer(st_select_lex_unit *unit) void Item_subselect::select_transformer(THD *thd, st_select_lex_unit *unit)
{ {
DBUG_ENTER("Item_subselect::select_transformer"); DBUG_ENTER("Item_subselect::select_transformer");
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
@@ -146,6 +151,46 @@ void Item_singlerow_subselect::reset()
value->null_value= 1; value->null_value= 1;
} }
void Item_singlerow_subselect::select_transformer(THD *thd,
st_select_lex_unit *unit)
{
SELECT_LEX *select_lex= unit->first_select();
if (!select_lex->next_select() && !select_lex->table_list.elements &&
select_lex->item_list.elements == 1)
{
have_to_be_excluded= 1;
if (thd->lex.describe)
{
char warn_buff[MYSQL_ERRMSG_SIZE];
sprintf(warn_buff, ER(ER_SELECT_REDUCED), select_lex->select_number);
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_SELECT_REDUCED, warn_buff);
}
substitution= select_lex->item_list.head();
substitution->set_outer_resolving();
if (substitution->type() == FIELD_ITEM ||
substitution->type() == REF_ITEM)
name= substitution->name; // Save name for correct resolving
if (select_lex->where || select_lex->having)
{
Item *cond;
if (!select_lex->having)
cond= select_lex->where;
else if (!select_lex->where)
cond= select_lex->having;
else
if (!(cond= new Item_cond_and(select_lex->having, select_lex->where)))
return;
if (!(substitution= new Item_func_if(cond, substitution,
new Item_null())))
return;
}
}
}
void Item_singlerow_subselect::store(uint i, Item *item) void Item_singlerow_subselect::store(uint i, Item *item)
{ {
row[i]->store(item); row[i]->store(item);
@@ -162,21 +207,13 @@ void Item_singlerow_subselect::fix_length_and_dec()
{ {
engine->fix_length_and_dec(row= &value); engine->fix_length_and_dec(row= &value);
if (!(value= Item_cache::get_cache(engine->type()))) if (!(value= Item_cache::get_cache(engine->type())))
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return; return;
} }
}
else else
{ {
THD *thd= current_thd; THD *thd= current_thd;
if (!(row= (Item_cache**)thd->alloc(sizeof(Item_cache*)*max_columns))) if (!(row= (Item_cache**)thd->alloc(sizeof(Item_cache*)*max_columns)))
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
thd->fatal_error= 1;
return; return;
}
engine->fix_length_and_dec(row); engine->fix_length_and_dec(row);
value= *row; value= *row;
} }
@@ -395,7 +432,8 @@ Item_allany_subselect::Item_allany_subselect(Item_allany_subselect *item):
func= item->func; func= item->func;
} }
void Item_in_subselect::single_value_transformer(st_select_lex_unit *unit, void Item_in_subselect::single_value_transformer(THD *thd,
st_select_lex_unit *unit,
Item *left_expr, Item *left_expr,
compare_func_creator func) compare_func_creator func)
{ {
@@ -409,10 +447,8 @@ void Item_in_subselect::single_value_transformer(st_select_lex_unit *unit,
Item_in_optimizer *optimizer; Item_in_optimizer *optimizer;
substitution= optimizer= new Item_in_optimizer(left_expr, this); substitution= optimizer= new Item_in_optimizer(left_expr, this);
if (!optimizer) if (!optimizer)
{
current_thd->fatal_error= 1;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
}
/* /*
As far as Item_ref_in_optimizer do not substitude itself on fix_fields As far as Item_ref_in_optimizer do not substitude itself on fix_fields
we can use same item for all selects. we can use same item for all selects.
@@ -449,15 +485,9 @@ void Item_in_subselect::single_value_transformer(st_select_lex_unit *unit,
(char *)"<no matter>", (char *)"<no matter>",
(char*)"<result>")); (char*)"<result>"));
if (sl->having || sl->with_sum_func || sl->group_list.first) if (sl->having || sl->with_sum_func || sl->group_list.first)
if (sl->having) sl->having= and_items(sl->having, item);
sl->having= new Item_cond_and(sl->having, item);
else else
sl->having= item; sl->where= and_items(sl->where, item);
else
if (sl->where)
sl->where= new Item_cond_and(sl->where, item);
else
sl->where= item;
} }
else else
{ {
@@ -468,10 +498,7 @@ void Item_in_subselect::single_value_transformer(st_select_lex_unit *unit,
item= (*func)(expr, new Item_asterisk_remover(this, item, item= (*func)(expr, new Item_asterisk_remover(this, item,
(char *)"<no matter>", (char *)"<no matter>",
(char*)"<result>")); (char*)"<result>"));
if (sl->where) sl->where= and_items(sl->where, item);
sl->where= new Item_cond_and(sl->where, item);
else
sl->where= item;
} }
else else
{ {
@@ -498,7 +525,6 @@ void Item_in_subselect::single_value_transformer(st_select_lex_unit *unit,
item= (*func)(left_expr, item); item= (*func)(left_expr, item);
substitution= item; substitution= item;
have_to_be_excluded= 1; have_to_be_excluded= 1;
THD *thd= current_thd;
if (thd->lex.describe) if (thd->lex.describe)
{ {
char warn_buff[MYSQL_ERRMSG_SIZE]; char warn_buff[MYSQL_ERRMSG_SIZE];
@@ -513,7 +539,8 @@ void Item_in_subselect::single_value_transformer(st_select_lex_unit *unit,
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
void Item_in_subselect::row_value_transformer(st_select_lex_unit *unit, void Item_in_subselect::row_value_transformer(THD *thd,
st_select_lex_unit *unit,
Item *left_expr) Item *left_expr)
{ {
DBUG_ENTER("Item_in_subselect::row_value_transformer"); DBUG_ENTER("Item_in_subselect::row_value_transformer");
@@ -527,10 +554,8 @@ void Item_in_subselect::row_value_transformer(st_select_lex_unit *unit,
Item_in_optimizer *optimizer; Item_in_optimizer *optimizer;
substitution= optimizer= new Item_in_optimizer(left_expr, this); substitution= optimizer= new Item_in_optimizer(left_expr, this);
if (!optimizer) if (!optimizer)
{
current_thd->fatal_error= 1;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
}
unit->dependent= 1; unit->dependent= 1;
uint n= left_expr->cols(); uint n= left_expr->cols();
if (optimizer->preallocate_row() || (*optimizer->get_cache())->allocate(n)) if (optimizer->preallocate_row() || (*optimizer->get_cache())->allocate(n))
@@ -560,40 +585,32 @@ void Item_in_subselect::row_value_transformer(st_select_lex_unit *unit,
(char *)"<no matter>", (char *)"<no matter>",
(char *)"<left expr>"), (char *)"<left expr>"),
func); func);
if (!item) item= and_items(item, func);
item= func;
else
item= new Item_cond_and(item, func);
} }
if (sl->having || sl->with_sum_func || sl->group_list.first || if (sl->having || sl->with_sum_func || sl->group_list.first ||
!sl->table_list.elements) !sl->table_list.elements)
if (sl->having) sl->having= and_items(sl->having, item);
sl->having= new Item_cond_and(sl->having, item);
else else
sl->having= item; sl->where= and_items(sl->where, item);
else
if (sl->where)
sl->where= new Item_cond_and(sl->where, item);
else
sl->where= item;
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
void Item_in_subselect::select_transformer(st_select_lex_unit *unit) void Item_in_subselect::select_transformer(THD *thd, st_select_lex_unit *unit)
{ {
if (left_expr->cols() == 1) if (left_expr->cols() == 1)
single_value_transformer(unit, left_expr, single_value_transformer(thd, unit, left_expr,
&Item_bool_func2::eq_creator); &Item_bool_func2::eq_creator);
else else
row_value_transformer(unit, left_expr); row_value_transformer(thd, unit, left_expr);
} }
void Item_allany_subselect::select_transformer(st_select_lex_unit *unit) void Item_allany_subselect::select_transformer(THD *thd,
st_select_lex_unit *unit)
{ {
single_value_transformer(unit, left_expr, func); single_value_transformer(thd, unit, left_expr, func);
} }
subselect_single_select_engine::subselect_single_select_engine(THD *thd, subselect_single_select_engine::subselect_single_select_engine(THD *thd,
@@ -630,7 +647,7 @@ subselect_union_engine::subselect_union_engine(THD *thd,
subselect_engine(thd, item, result) subselect_engine(thd, item, result)
{ {
unit= u; unit= u;
if( !result) if (!result)
{ {
//out of memory //out of memory
thd->fatal_error= 1; thd->fatal_error= 1;
@@ -646,7 +663,7 @@ int subselect_single_select_engine::prepare()
prepared= 1; prepared= 1;
SELECT_LEX_NODE *save_select= thd->lex.current_select; SELECT_LEX_NODE *save_select= thd->lex.current_select;
thd->lex.current_select= select_lex; thd->lex.current_select= select_lex;
if(join->prepare((TABLE_LIST*) select_lex->table_list.first, if (join->prepare((TABLE_LIST*) select_lex->table_list.first,
select_lex->where, select_lex->where,
(ORDER*) select_lex->order_list.first, (ORDER*) select_lex->order_list.first,
(ORDER*) select_lex->group_list.first, (ORDER*) select_lex->group_list.first,
@@ -678,11 +695,7 @@ static Item_result set_row(SELECT_LEX *select_lex, Item * item,
if (row) if (row)
{ {
if (!(row[i]= Item_cache::get_cache(res_type))) if (!(row[i]= Item_cache::get_cache(res_type)))
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return STRING_RESULT; // we should return something return STRING_RESULT; // we should return something
}
row[i]->set_len_n_dec(sel_item->max_length, sel_item->decimals); row[i]->set_len_n_dec(sel_item->max_length, sel_item->decimals);
} }
} }
@@ -715,7 +728,7 @@ void subselect_union_engine::fix_length_and_dec(Item_cache **row)
mlen= len; mlen= len;
if (!sel_item) if (!sel_item)
sel_item= s_item; sel_item= s_item;
maybe_null!= s_item->maybe_null; maybe_null= s_item->maybe_null;
} }
item->max_length= mlen; item->max_length= mlen;
res_type= sel_item->result_type(); res_type= sel_item->result_type();
@@ -723,11 +736,7 @@ void subselect_union_engine::fix_length_and_dec(Item_cache **row)
if (row) if (row)
{ {
if (!(row[0]= Item_cache::get_cache(res_type))) if (!(row[0]= Item_cache::get_cache(res_type)))
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
current_thd->fatal_error= 1;
return; return;
}
row[0]->set_len_n_dec(mlen, sel_item->decimals); row[0]->set_len_n_dec(mlen, sel_item->decimals);
} }
} }
@@ -736,7 +745,7 @@ void subselect_union_engine::fix_length_and_dec(Item_cache **row)
SELECT_LEX *sl= unit->first_select(); SELECT_LEX *sl= unit->first_select();
bool fake= 0; bool fake= 0;
res_type= set_row(sl, item, row, &fake); res_type= set_row(sl, item, row, &fake);
for(sl= sl->next_select(); sl; sl->next_select()) for (sl= sl->next_select(); sl; sl->next_select())
{ {
List_iterator_fast<Item> li(sl->item_list); List_iterator_fast<Item> li(sl->item_list);
Item *sel_item; Item *sel_item;

12
sql/item_subselect.h
View File

@@ -71,7 +71,7 @@ public:
{ {
null_value= 1; null_value= 1;
} }
virtual void select_transformer(st_select_lex_unit *unit); virtual void select_transformer(THD *thd, st_select_lex_unit *unit);
bool assigned() { return value_assigned; } bool assigned() { return value_assigned; }
void assigned(bool a) { value_assigned= a; } void assigned(bool a) { value_assigned= a; }
enum Type type() const; enum Type type() const;
@@ -106,6 +106,7 @@ public:
decimals= item->decimals; decimals= item->decimals;
} }
void reset(); void reset();
void select_transformer(THD *thd, st_select_lex_unit *unit);
void store(uint i, Item* item); void store(uint i, Item* item);
double val(); double val();
longlong val_int (); longlong val_int ();
@@ -172,10 +173,11 @@ public:
null_value= 0; null_value= 0;
was_null= 0; was_null= 0;
} }
virtual void select_transformer(st_select_lex_unit *unit); virtual void select_transformer(THD *thd, st_select_lex_unit *unit);
void single_value_transformer(st_select_lex_unit *unit, void single_value_transformer(THD *thd, st_select_lex_unit *unit,
Item *left_expr, compare_func_creator func); Item *left_expr, compare_func_creator func);
void row_value_transformer(st_select_lex_unit *unit, Item *left_expr); void row_value_transformer(THD *thd, st_select_lex_unit *unit,
Item *left_expr);
longlong val_int(); longlong val_int();
double val(); double val();
String *val_str(String*); String *val_str(String*);
@@ -194,7 +196,7 @@ public:
Item_allany_subselect(THD *thd, Item * left_expr, compare_func_creator f, Item_allany_subselect(THD *thd, Item * left_expr, compare_func_creator f,
st_select_lex *select_lex); st_select_lex *select_lex);
Item_allany_subselect(Item_allany_subselect *item); Item_allany_subselect(Item_allany_subselect *item);
virtual void select_transformer(st_select_lex_unit *unit); virtual void select_transformer(THD *thd, st_select_lex_unit *unit);
}; };
class subselect_engine: public Sql_alloc class subselect_engine: public Sql_alloc

2
sql/mysql_priv.h
View File

@@ -466,7 +466,7 @@ bool drop_locked_tables(THD *thd,const char *db, const char *table_name);
void abort_locked_tables(THD *thd,const char *db, const char *table_name); void abort_locked_tables(THD *thd,const char *db, const char *table_name);
extern const Field *not_found_field; extern const Field *not_found_field;
Field *find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, Field *find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
bool report_error); TABLE_LIST **where, bool report_error);
Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length, Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length,
bool check_grant,bool allow_rowid); bool check_grant,bool allow_rowid);
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL

16
sql/nt_servc.cc
View File

@@ -431,7 +431,7 @@ BOOL NTService::SeekStatus(LPCSTR szInternName, int OperationType)
if (ret_error == ERROR_ACCESS_DENIED) if (ret_error == ERROR_ACCESS_DENIED)
{ {
printf("Install/Remove of the Service Denied!\n"); printf("Install/Remove of the Service Denied!\n");
if(!is_super_user()) if (!is_super_user())
printf("That operation should be made by an user with Administrator privileges!\n"); printf("That operation should be made by an user with Administrator privileges!\n");
} }
else else
@@ -530,12 +530,12 @@ BOOL NTService::is_super_user()
UINT x; UINT x;
BOOL ret_value=FALSE; BOOL ret_value=FALSE;
if(!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE,&hAccessToken )) if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE,&hAccessToken ))
{ {
if(GetLastError() != ERROR_NO_TOKEN) if (GetLastError() != ERROR_NO_TOKEN)
return FALSE; return FALSE;
if(!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hAccessToken)) if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hAccessToken))
return FALSE; return FALSE;
} }
@@ -544,10 +544,10 @@ BOOL NTService::is_super_user()
CloseHandle(hAccessToken); CloseHandle(hAccessToken);
if(!ret_value ) if (!ret_value )
return FALSE; return FALSE;
if(!AllocateAndInitializeSid(&siaNtAuthority, 2, if (!AllocateAndInitializeSid(&siaNtAuthority, 2,
SECURITY_BUILTIN_DOMAIN_RID, SECURITY_BUILTIN_DOMAIN_RID,
DOMAIN_ALIAS_RID_ADMINS, DOMAIN_ALIAS_RID_ADMINS,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -556,9 +556,9 @@ BOOL NTService::is_super_user()
ret_value = FALSE; ret_value = FALSE;
for(x=0;x<ptgGroups->GroupCount;x++) for (x=0;x<ptgGroups->GroupCount;x++)
{ {
if( EqualSid(psidAdministrators, ptgGroups->Groups[x].Sid) ) if ( EqualSid(psidAdministrators, ptgGroups->Groups[x].Sid) )
{ {
ret_value = TRUE; ret_value = TRUE;
break; break;

11
sql/opt_range.cc
View File

@@ -2162,12 +2162,13 @@ check_quick_keys(PARAM *param,uint idx,SEL_ARG *key_tree,
tmp=1; // Max one record tmp=1; // Max one record
else else
{ {
if(tmp_min_flag & GEOM_FLAG) if (tmp_min_flag & GEOM_FLAG)
{ {
tmp=param->table->file-> tmp= param->table->file->
records_in_range((int) keynr,(byte*)(param->min_key + 1), records_in_range((int) keynr, (byte*)(param->min_key + 1),
min_key_length, (ha_rkey_function)(tmp_min_flag ^ GEOM_FLAG), min_key_length,
(byte *)NullS,0,HA_READ_KEY_EXACT); (ha_rkey_function)(tmp_min_flag ^ GEOM_FLAG),
(byte *)NullS, 0, HA_READ_KEY_EXACT);
} }
else else
{ {

2
sql/password.c
View File

@@ -573,7 +573,7 @@ void get_hash_and_password(ulong* salt, uint8 pversion, char* hash, unsigned cha
while (salt<salt_end) /* Iterate over these elements*/ while (salt<salt_end) /* Iterate over these elements*/
{ {
val=*salt; val=*salt;
for(t=3;t>=0;t--) for (t=3;t>=0;t--)
{ {
bp[t]=val%256; bp[t]=val%256;

6
sql/spatial.cc
View File

@@ -506,7 +506,7 @@ int GPolygon::get_data_as_text(String *txt) const
for (; n_linear_rings>0; --n_linear_rings) for (; n_linear_rings>0; --n_linear_rings)
{ {
if(no_data(data, 4)) if (no_data(data, 4))
return 1; return 1;
uint32 n_points = uint4korr(data); uint32 n_points = uint4korr(data);
data += 4; data += 4;
@@ -593,7 +593,7 @@ int GPolygon::area(double *ar) const
data += (8+8); data += (8+8);
} }
lr_area=fabs(lr_area)/2; lr_area=fabs(lr_area)/2;
if(result==-1) result=lr_area; if (result==-1) result=lr_area;
else result-=lr_area; else result-=lr_area;
} }
*ar=fabs(result); *ar=fabs(result);
@@ -1344,7 +1344,7 @@ int GGeometryCollection::get_mbr(MBR *mbr) const
data += 4; data += 4;
for (; n_objects>0; --n_objects) for (; n_objects>0; --n_objects)
{ {
if(no_data(data, WKB_HEADER_SIZE)) if (no_data(data, WKB_HEADER_SIZE))
return 1; return 1;
uint32 wkb_type = uint4korr(data + sizeof(char)); uint32 wkb_type = uint4korr(data + sizeof(char));
data += WKB_HEADER_SIZE; data += WKB_HEADER_SIZE;

5
sql/sql_base.cc
View File

@@ -1655,6 +1655,7 @@ const Field *not_found_field= (Field*) 0x1;
thd - pointer to current thread structure thd - pointer to current thread structure
item - field item that should be found item - field item that should be found
tables - tables for scaning tables - tables for scaning
where - table where field found will be returned via this parameter
report_error - if FALSE then do not report error if item not found and report_error - if FALSE then do not report error if item not found and
return not_found_field; return not_found_field;
@@ -1668,7 +1669,7 @@ const Field *not_found_field= (Field*) 0x1;
Field * Field *
find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables, find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
bool report_error) TABLE_LIST **where, bool report_error)
{ {
Field *found=0; Field *found=0;
const char *db=item->db_name; const char *db=item->db_name;
@@ -1689,6 +1690,7 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
grant_option && !thd->master_access,1); grant_option && !thd->master_access,1);
if (find) if (find)
{ {
(*where)= tables;
if (find == WRONG_GRANT) if (find == WRONG_GRANT)
return (Field*) 0; return (Field*) 0;
if (db || !thd->where) if (db || !thd->where)
@@ -1751,6 +1753,7 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
{ {
if (field == WRONG_GRANT) if (field == WRONG_GRANT)
return (Field*) 0; return (Field*) 0;
(*where)= tables;
if (found) if (found)
{ {
if (!thd->where) // Returns first found if (!thd->where) // Returns first found

9
sql/sql_derived.cc
View File

@@ -63,6 +63,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
TMP_TABLE_PARAM tmp_table_param; TMP_TABLE_PARAM tmp_table_param;
bool is_union=sl->next_select() && sl->next_select()->linkage == UNION_TYPE; bool is_union=sl->next_select() && sl->next_select()->linkage == UNION_TYPE;
DBUG_ENTER("mysql_derived"); DBUG_ENTER("mysql_derived");
SELECT_LEX_NODE *save_current_select= lex->current_select;
/* /*
@@ -111,6 +112,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
} }
} }
lex->current_select= sl;
if (setup_fields(thd,tables,item_list,0,0,1)) if (setup_fields(thd,tables,item_list,0,0,1))
{ {
res=-1; res=-1;
@@ -119,7 +121,8 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
bzero((char*) &tmp_table_param,sizeof(tmp_table_param)); bzero((char*) &tmp_table_param,sizeof(tmp_table_param));
tmp_table_param.field_count=item_list.elements; tmp_table_param.field_count=item_list.elements;
if (!(table=create_tmp_table(thd, &tmp_table_param, item_list, if (!(table=create_tmp_table(thd, &tmp_table_param, item_list,
(ORDER*) 0, is_union && !unit->union_option, 1, (ORDER*) 0,
is_union && !unit->union_option, 1,
(sl->options | thd->options | (sl->options | thd->options |
TMP_TABLE_ALL_COLUMNS), TMP_TABLE_ALL_COLUMNS),
HA_POS_ERROR))) HA_POS_ERROR)))
@@ -138,8 +141,6 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
if (unit->select_limit_cnt == HA_POS_ERROR) if (unit->select_limit_cnt == HA_POS_ERROR)
sl->options&= ~OPTION_FOUND_ROWS; sl->options&= ~OPTION_FOUND_ROWS;
SELECT_LEX_NODE *save_current_select= lex->current_select;
lex->current_select= sl;
if (is_union) if (is_union)
res=mysql_union(thd,lex,derived_result,unit); res=mysql_union(thd,lex,derived_result,unit);
else else
@@ -149,7 +150,6 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
sl->having, (ORDER*) NULL, sl->having, (ORDER*) NULL,
sl->options | thd->options | SELECT_NO_UNLOCK, sl->options | thd->options | SELECT_NO_UNLOCK,
derived_result, unit, sl, 0); derived_result, unit, sl, 0);
lex->current_select= save_current_select;
if (!res) if (!res)
{ {
@@ -179,6 +179,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
if (res) if (res)
free_tmp_table(thd,table); free_tmp_table(thd,table);
exit: exit:
lex->current_select= save_current_select;
close_thread_tables(thd); close_thread_tables(thd);
} }
DBUG_RETURN(res); DBUG_RETURN(res);

6
sql/sql_help.cc
View File

@@ -96,7 +96,7 @@ int search_functions(MI_INFO *file_leafs, const char *mask,
DBUG_ENTER("search_functions"); DBUG_ENTER("search_functions");
int count= 0; int count= 0;
if(mi_scan_init(file_leafs)) if (mi_scan_init(file_leafs))
DBUG_RETURN(-1); DBUG_RETURN(-1);
help_leaf leaf; help_leaf leaf;
@@ -191,7 +191,7 @@ int search_categories(THD *thd,
if (!(file_categories= open_help_file(thd,"function_category_name"))) if (!(file_categories= open_help_file(thd,"function_category_name")))
DBUG_RETURN(-1); DBUG_RETURN(-1);
if(mi_scan_init(file_categories)) if (mi_scan_init(file_categories))
{ {
mi_close(file_categories); mi_close(file_categories);
DBUG_RETURN(-1); DBUG_RETURN(-1);
@@ -393,7 +393,7 @@ int mysqld_help(THD *thd, const char *mask)
description->ptr(), example->ptr()))) description->ptr(), example->ptr())))
goto end; goto end;
} }
else if((res= send_header_2(protocol)) || else if ((res= send_header_2(protocol)) ||
(res= send_variant_2_list(protocol,&function_list,false)) || (res= send_variant_2_list(protocol,&function_list,false)) ||
(search_categories(thd, mask, &categories_list, 0)<0 && (search_categories(thd, mask, &categories_list, 0)<0 &&
(res=1)) || (res=1)) ||

6
sql/sql_lex.cc
View File

@@ -1037,7 +1037,7 @@ void st_select_lex_node::include_global(st_select_lex_node **plink)
//excluding from global list (internal function) //excluding from global list (internal function)
void st_select_lex_node::fast_exclude() void st_select_lex_node::fast_exclude()
{ {
if(link_prev) if (link_prev)
{ {
if ((*link_prev= link_next)) if ((*link_prev= link_next))
link_next->link_prev= link_prev; link_next->link_prev= link_prev;
@@ -1069,7 +1069,7 @@ void st_select_lex_node::exclude()
void st_select_lex_unit::exclude_level() void st_select_lex_unit::exclude_level()
{ {
SELECT_LEX_UNIT *units= 0, **units_last= &units; SELECT_LEX_UNIT *units= 0, **units_last= &units;
for(SELECT_LEX *sl= first_select(); sl; sl= sl->next_select()) for (SELECT_LEX *sl= first_select(); sl; sl= sl->next_select())
{ {
if (sl->link_prev && (*sl->link_prev= sl->link_next)) if (sl->link_prev && (*sl->link_prev= sl->link_next))
sl->link_next->link_prev= sl->link_prev; sl->link_next->link_prev= sl->link_prev;
@@ -1143,7 +1143,7 @@ void st_select_lex_node::mark_as_dependent(SELECT_LEX *last)
for (SELECT_LEX_NODE *s= this; for (SELECT_LEX_NODE *s= this;
s &&s != last; s &&s != last;
s= s->outer_select()) s= s->outer_select())
if( !s->dependent ) if ( !s->dependent )
{ {
// Select is dependent of outer select // Select is dependent of outer select
s->dependent= 1; s->dependent= 1;

12
sql/sql_olap.cc
View File

@@ -62,7 +62,7 @@ static int make_new_olap_select(LEX *lex, SELECT_LEX *select_lex, List<Item> new
List_iterator<Item> list_it(select_lex->item_list); List_iterator<Item> list_it(select_lex->item_list);
List_iterator<Item> new_it(new_fields); List_iterator<Item> new_it(new_fields);
while((item=list_it++)) while ((item=list_it++))
{ {
bool not_found=true; bool not_found=true;
if (item->type()==Item::FIELD_ITEM) if (item->type()==Item::FIELD_ITEM)
@@ -109,15 +109,15 @@ static int olap_combos(List<Item> old_fields, List<Item> new_fields, Item *item
int num_new_fields) int num_new_fields)
{ {
int sl_return = 0; int sl_return = 0;
if(position == num_new_fields) if (position == num_new_fields)
{ {
if(item) if (item)
new_fields.push_front(item); new_fields.push_front(item);
sl_return = make_new_olap_select(lex, select_lex, new_fields); sl_return = make_new_olap_select(lex, select_lex, new_fields);
} }
else else
{ {
if(item) if (item)
new_fields.push_front(item); new_fields.push_front(item);
while ((num_fields - num_new_fields >= selection - position) && !sl_return) while ((num_fields - num_new_fields >= selection - position) && !sl_return)
{ {
@@ -170,12 +170,12 @@ int handle_olaps(LEX *lex, SELECT_LEX *select_lex)
if (select_lex->olap == CUBE_TYPE) if (select_lex->olap == CUBE_TYPE)
{ {
for( int i=count-1; i>=0 && !sl_return; i--) for ( int i=count-1; i>=0 && !sl_return; i--)
sl_return=olap_combos(item_list_copy, new_item_list, (Item *)0, lex, select_lex, 0, 0, count, i); sl_return=olap_combos(item_list_copy, new_item_list, (Item *)0, lex, select_lex, 0, 0, count, i);
} }
else if (select_lex->olap == ROLLUP_TYPE) else if (select_lex->olap == ROLLUP_TYPE)
{ {
for( int i=count-1; i>=0 && !sl_return; i--) for ( int i=count-1; i>=0 && !sl_return; i--)
{ {
Item *item; Item *item;
item_list_copy.pop(); item_list_copy.pop();

2
sql/sql_select.cc
View File

@@ -1160,7 +1160,7 @@ mysql_select(THD *thd, TABLE_LIST *tables, List<Item> &fields, COND *conds,
if (thd->possible_loops) if (thd->possible_loops)
{ {
Item *item; Item *item;
while(thd->possible_loops->elements) while (thd->possible_loops->elements)
{ {
item= thd->possible_loops->pop(); item= thd->possible_loops->pop();
if (item->check_loop(thd->check_loops_counter++)) if (item->check_loop(thd->check_loops_counter++))

2
sql/sql_show.cc
View File

@@ -1112,7 +1112,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
packet->append(" USING BTREE", 12); packet->append(" USING BTREE", 12);
// +BAR: send USING only in non-default case: non-spatial rtree // +BAR: send USING only in non-default case: non-spatial rtree
if((key_info->algorithm == HA_KEY_ALG_RTREE) && if ((key_info->algorithm == HA_KEY_ALG_RTREE) &&
!(key_info->flags & HA_SPATIAL)) !(key_info->flags & HA_SPATIAL))
packet->append(" USING RTREE",12); packet->append(" USING RTREE",12);

2
sql/sql_string.cc
View File

@@ -254,7 +254,7 @@ bool String::copy(const char *str,uint32 arg_length, CHARSET_INFO *from, CHARSET
break; break;
outp: outp:
if((cnvres=to->wc_mb(to,wc,d,de)) >0 ) if ((cnvres=to->wc_mb(to,wc,d,de)) >0 )
{ {
d+=cnvres; d+=cnvres;
} }

2
sql/sql_table.cc
View File

@@ -399,7 +399,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
it.rewind(); it.rewind();
while ((sql_field=it++)) while ((sql_field=it++))
{ {
if(!sql_field->charset) if (!sql_field->charset)
sql_field->charset = create_info->table_charset ? sql_field->charset = create_info->table_charset ?
create_info->table_charset : create_info->table_charset :
thd->db_charset? thd->db_charset : thd->db_charset? thd->db_charset :

6
sql/stacktrace.c
View File

@@ -38,7 +38,7 @@ void safe_print_str(const char* name, const char* val, int max_len)
} }
fprintf(stderr, "= "); fprintf(stderr, "= ");
for(; max_len && PTR_SANE(val) && *val; --max_len) for (; max_len && PTR_SANE(val) && *val; --max_len)
fputc(*val++, stderr); fputc(*val++, stderr);
fputc('\n', stderr); fputc('\n', stderr);
} }
@@ -59,7 +59,7 @@ void safe_print_str(const char* name, const char* val, int max_len)
inline uchar** find_prev_fp(uint32* pc, uchar** fp) inline uchar** find_prev_fp(uint32* pc, uchar** fp)
{ {
int i; int i;
for(i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc) for (i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc)
{ {
uchar* p = (uchar*)pc; uchar* p = (uchar*)pc;
if (p[2] == 222 && p[3] == 35) if (p[2] == 222 && p[3] == 35)
@@ -73,7 +73,7 @@ inline uchar** find_prev_fp(uint32* pc, uchar** fp)
inline uint32* find_prev_pc(uint32* pc, uchar** fp) inline uint32* find_prev_pc(uint32* pc, uchar** fp)
{ {
int i; int i;
for(i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc) for (i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc)
{ {
char* p = (char*)pc; char* p = (char*)pc;
if (p[1] == 0 && p[2] == 94 && p[3] == -73) if (p[1] == 0 && p[2] == 94 && p[3] == -73)