Commit 684bda9a authored by unknown's avatar unknown
Browse files

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

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

sql/handler.cc

+83 −75
Original line number Diff line number Diff line
@@ -3221,8 +3221,9 @@ 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",
@@ -3262,7 +3263,8 @@ 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)

  {
@@ -3307,13 +3309,19 @@ template<class RowsEventT> int binlog_log_row(TABLE* table, 




  /*

  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 */