Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

sql/handler.cc

@@ -1178,6 +1178,7 @@ int ha_release_temporary_latches(THD *thd)
 #ifdef WITH_INNOBASE_STORAGE_ENGINE
   innobase_release_temporary_latches(thd);
 #endif
+  return 0;
 }
 
 int ha_rollback_to_savepoint(THD *thd, SAVEPOINT *sv)
@@ -2074,7 +2075,8 @@ int ha_enable_transaction(THD *thd, bool on)
       is an optimization hint that storage engine is free to ignore.
       So, let's commit an open transaction (if any) now.
     */
-    error= end_trans(thd, COMMIT);
+    if (!(error= ha_commit_stmt(thd)))
+      error= end_trans(thd, COMMIT);
   }
   DBUG_RETURN(error);
 }
@@ -2788,7 +2790,7 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
   - Row-based replication is on
   - It is not a temporary table
   - The binlog is enabled
-  - The table shall be binlogged (binlog_*_db rules) [Seems disabled /Matz]
+  - The table shall be binlogged (binlog_*_db rules)
 */
 
 #ifdef HAVE_ROW_BASED_REPLICATION
@@ -2797,7 +2799,8 @@ static bool check_table_binlog_row_based(THD *thd, TABLE *table)
   return
     binlog_row_based &&
     thd && (thd->options & OPTION_BIN_LOG) &&
-    (table->s->tmp_table == NO_TMP_TABLE);
+    (table->s->tmp_table == NO_TMP_TABLE) &&
+    binlog_filter->db_ok(table->s->db.str);
 }
 
 template<class RowsEventT> int binlog_log_row(TABLE* table,