mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/home/bk/b19066-mysql-5.1-new
This commit is contained in:
unknown 2006-06-15 10:29:06 +02:00
commit 684bda9a06
1 changed files with 84 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sql/handler.cc
View file

@ -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,18 +3305,24 @@ 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.
*/
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 *);
}
/*
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 *);
#endif /* HAVE_ROW_BASED_REPLICATION */
int handler::ha_external_lock(THD *thd, int lock_type)