mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Igor Babaev 2011-05-19 17:02:47 -07:00
commit 2feb13cdb4
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/item.cc
View file

@ -8866,7 +8866,7 @@ inline st_select_lex *Item_ident::get_depended_from() const
{ {
st_select_lex *dep; st_select_lex *dep;
if ((dep= depended_from)) if ((dep= depended_from))
for ( ; dep->merged_into; dep= dep->merged_into); for ( ; dep->merged_into; dep= dep->merged_into) ;
return dep; return dep;
} }

3
sql/sql_derived.cc
View file

@ -857,14 +857,13 @@ bool mysql_derived_create(THD *thd, LEX *lex, TABLE_LIST *derived)
bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived) bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived)
{ {
TABLE *table= derived->table;
SELECT_LEX_UNIT *unit= derived->get_unit(); SELECT_LEX_UNIT *unit= derived->get_unit();
bool res= FALSE; bool res= FALSE;
if (unit->executed && !unit->uncacheable && !unit->describe) if (unit->executed && !unit->uncacheable && !unit->describe)
return FALSE; return FALSE;
/*check that table creation passed without problems. */ /*check that table creation passed without problems. */
DBUG_ASSERT(table && table->created); DBUG_ASSERT(derived->table && derived->table->created);
SELECT_LEX *first_select= unit->first_select(); SELECT_LEX *first_select= unit->first_select();
select_union *derived_result= derived->derived_result; select_union *derived_result= derived->derived_result;
SELECT_LEX *save_current_select= lex->current_select; SELECT_LEX *save_current_select= lex->current_select;

2
sql/sql_select.cc
View file

@ -12091,7 +12091,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
(orig_item && orig_item->maybe_null)) && /* for outer joined views/dt*/ (orig_item && orig_item->maybe_null)) && /* for outer joined views/dt*/
!field->field->maybe_null()) !field->field->maybe_null())
{ {
bool save_maybe_null; bool save_maybe_null= FALSE;
/* /*
The item the ref points to may have maybe_null flag set while The item the ref points to may have maybe_null flag set while
the ref doesn't have it. This may happen for outer fields the ref doesn't have it. This may happen for outer fields