bzr push into mysql-trunk branch (olav.sandstaa:3781 to 3782) Bug#12365385

[Olav Sandstaa]

 3782 Olav Sandstaa	2012-03-15
      Post-push fix for BUG#12365385.
      
      Fix compiler warning about unused variable that occured in non-debug builds.

    modified:
      sql/handler.cc
 3781 Alfranio Correia	2012-03-15
      Post-push fix for BUG#13538891.
      
      Updated result files for some tests cases that were failing after
      BUG#13538891.

    modified:
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/r/innodb_8k.result
=== modified file 'sql/handler.cc'

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2012-03-15 10:13:19 +0000
+++ b/sql/handler.cc	2012-03-15 12:47:30 +0000
@@ -4988,8 +4988,11 @@
     // Transfer ICP from h to h2
     if (mrr_keyno == h->pushed_idx_cond_keyno)
     {
-      const Item* ret= h2->idx_cond_push(mrr_keyno, h->pushed_idx_cond);
-      DBUG_ASSERT(ret == NULL);
+      if (h2->idx_cond_push(mrr_keyno, h->pushed_idx_cond))
+      {
+        retval= 1;
+        goto error;
+      }
     }
     else
     {

No bundle (reason: useless for push emails).