Commit 0e25a6f0 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/dlenev/src/mysql-5.0
parents 2aa5d925 5bc79c0c

sql/sql_derived.cc

+0 −5
Original line number Diff line number Diff line
@@ -268,13 +268,8 @@ int mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) 
        unit->cleanup();

    }

    else

    {

      free_tmp_table(thd, table);

      unit->cleanup();

    }

    lex->current_select= save_current_select;

    if (res)

      free_tmp_table(thd, table);

  }

  return res;

}