database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixing code to avoid compile problem on Solaris (aCC).

Browse Source
This commit is contained in:
mats@mysql.com
2006-06-15 10:11:50 +02:00
parent 95b1c019b8
commit cf46736746
1 changed files with 84 additions and 76 deletions
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::lock
THD::locked_tables THD::locked_tables
*/ */
static int namespace
write_locked_table_maps(THD *thd)
{ {
int write_locked_table_maps(THD *thd)
{
DBUG_ENTER("write_locked_table_maps"); DBUG_ENTER("write_locked_table_maps");
DBUG_PRINT("enter", ("thd=%p, thd->lock=%p, thd->locked_tables=%p", DBUG_PRINT("enter", ("thd=%p, thd->lock=%p, thd->locked_tables=%p",
thd, thd->lock, thd->locked_tables)); thd, thd->lock, thd->locked_tables));
@@ -3260,12 +3261,13 @@ write_locked_table_maps(THD *thd)
} }
} }
DBUG_RETURN(0); 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 *before_record,
const byte *after_record) const byte *after_record)
{ {
if (table->file->is_injective()) if (table->file->is_injective())
return 0; return 0;
bool error= 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; 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 */ #endif /* HAVE_ROW_BASED_REPLICATION */
int handler::ha_external_lock(THD *thd, int lock_type) int handler::ha_external_lock(THD *thd, int lock_type)