Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl

into  mysql.com:/home/bk/b19066-mysql-5.1-new

sql/handler.cc

@@ -3221,9 +3221,10 @@ namespace {
        THD::lock
        THD::locked_tables
  */
-static int
-write_locked_table_maps(THD *thd)
+namespace
 {
+  int write_locked_table_maps(THD *thd)
+  {
     DBUG_ENTER("write_locked_table_maps");
     DBUG_PRINT("enter", ("thd=%p, thd->lock=%p, thd->locked_tables=%p",
                          thd, thd->lock, thd->locked_tables));
@@ -3260,12 +3261,13 @@ write_locked_table_maps(THD *thd)
       }
     }
     DBUG_RETURN(0);
-}
+  }
 
-template<class RowsEventT> int binlog_log_row(TABLE* table,
+  template<class RowsEventT> int
+  binlog_log_row(TABLE* table,
                  const byte *before_record,
                  const byte *after_record)
-{
+  {
     if (table->file->is_injective())
       return 0;
     bool error= 0;
@@ -3303,17 +3305,23 @@ template<class RowsEventT> int binlog_log_row(TABLE* table,
       }
     }
     return error ? HA_ERR_RBR_LOGGING_FAILED : 0;
-}
+  }
 
 
-/*
-  Instantiate the versions we need for the above template function, because we
-  have -fno-implicit-template as compiling option.
-*/
+  /*
+    Instantiate the versions we need for the above template function,
+    because we have -fno-implicit-template as compiling option.
+  */
 
-template int binlog_log_row<Write_rows_log_event>(TABLE *, const byte *, const byte *);
-template int binlog_log_row<Delete_rows_log_event>(TABLE *, const byte *, const byte *);
-template int binlog_log_row<Update_rows_log_event>(TABLE *, const byte *, const byte *);
+  template int
+  binlog_log_row<Write_rows_log_event>(TABLE *, const byte *, const byte *);
+
+  template int
+  binlog_log_row<Delete_rows_log_event>(TABLE *, const byte *, const byte *);
+
+  template int
+  binlog_log_row<Update_rows_log_event>(TABLE *, const byte *, const byte *);
+}
 
 #endif /* HAVE_ROW_BASED_REPLICATION */