bzr push into mysql-trunk branch (evgeny.potemkin:3386 to 3387)

[Evgeny Potemkin]

 3387 Evgeny Potemkin	2011-08-18
      A local variable used only in assertion caused an 'unused variable' warning on a
      non-debug build.
      The 'table' variable is removed from mysql_derived_materialize function.

    modified:
      sql/sql_derived.cc
 3386 Marko Mäkelä	2011-08-18
      Fix a regression from WL#5580:
      InnoDB would complain about LSN mismatch on compressed pages,
      even though there is no second copy of the LSN written on compressed pages.
      Noticed by Vasil Dimov when running innodb.innodb_bug56680.

    modified:
      storage/innobase/buf/buf0flu.c
=== modified file 'sql/sql_derived.cc'
--- a/sql/sql_derived.cc	2011-07-27 11:10:28 +0000
+++ b/sql/sql_derived.cc	2011-08-18 11:25:59 +0000
@@ -377,12 +377,11 @@ bool mysql_derived_create(THD *thd, LEX
 
 bool mysql_derived_materialize(THD *thd, LEX *lex, TABLE_LIST *derived)
 {
-  TABLE *table= derived->table;
   SELECT_LEX_UNIT *unit= derived->get_unit();
   bool res= FALSE;
   DBUG_ENTER("mysql_derived_materialize");
 
-  DBUG_ASSERT(unit && table && table->created);
+  DBUG_ASSERT(unit && derived->table && derived->table->created);
 
   if (derived->materialized)
     DBUG_RETURN(FALSE);

No bundle (reason: useless for push emails).