database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +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

160
sql/handler.cc
View File

@@ -3221,100 +3221,108 @@ namespace {
THD::lock THD::lock
THD::locked_tables THD::locked_tables
*/ */
static int namespace
write_locked_table_maps(THD *thd)
{ {
DBUG_ENTER("write_locked_table_maps"); int write_locked_table_maps(THD *thd)
DBUG_PRINT("enter", ("thd=%p, thd->lock=%p, thd->locked_tables=%p",
thd, thd->lock, thd->locked_tables));
if (thd->get_binlog_table_maps() == 0)
{ {
/* DBUG_ENTER("write_locked_table_maps");
Exactly one table has to be locked, otherwise this code is not DBUG_PRINT("enter", ("thd=%p, thd->lock=%p, thd->locked_tables=%p",
guaranteed to work. thd, thd->lock, thd->locked_tables));
*/
DBUG_ASSERT((thd->lock != NULL) + (thd->locked_tables != NULL) == 1);
MYSQL_LOCK *lock= thd->lock ? thd->lock : thd->locked_tables; if (thd->get_binlog_table_maps() == 0)
DBUG_ASSERT(lock->table_count > 0);
TABLE **const end_ptr= lock->table + lock->table_count;
for (TABLE **table_ptr= lock->table ;
table_ptr != end_ptr ;
++table_ptr)
{ {
TABLE *const table= *table_ptr; /*
DBUG_PRINT("info", ("Checking table %s", table->s->table_name)); Exactly one table has to be locked, otherwise this code is not
if (table->current_lock == F_WRLCK && guaranteed to work.
check_table_binlog_row_based(thd, table)) */
DBUG_ASSERT((thd->lock != NULL) + (thd->locked_tables != NULL) == 1);
MYSQL_LOCK *lock= thd->lock ? thd->lock : thd->locked_tables;
DBUG_ASSERT(lock->table_count > 0);
TABLE **const end_ptr= lock->table + lock->table_count;
for (TABLE **table_ptr= lock->table ;
table_ptr != end_ptr ;
++table_ptr)
{ {
int const has_trans= table->file->has_transactions(); TABLE *const table= *table_ptr;
int const error= thd->binlog_write_table_map(table, has_trans); DBUG_PRINT("info", ("Checking table %s", table->s->table_name));
/* if (table->current_lock == F_WRLCK &&
If an error occurs, it is the responsibility of the caller to check_table_binlog_row_based(thd, table))
roll back the transaction. {
*/ int const has_trans= table->file->has_transactions();
if (unlikely(error)) int const error= thd->binlog_write_table_map(table, has_trans);
DBUG_RETURN(1); /*
If an error occurs, it is the responsibility of the caller to
roll back the transaction.
*/
if (unlikely(error))
DBUG_RETURN(1);
}
} }
} }
DBUG_RETURN(0);
} }
DBUG_RETURN(0);
}
template<class RowsEventT> int binlog_log_row(TABLE* table, template<class RowsEventT> int
const byte *before_record, binlog_log_row(TABLE* table,
const byte *after_record) const byte *before_record,
{ const byte *after_record)
if (table->file->is_injective())
return 0;
bool error= 0;
THD *const thd= table->in_use;
if (check_table_binlog_row_based(thd, table))
{ {
MY_BITMAP cols; if (table->file->is_injective())
/* Potential buffer on the stack for the bitmap */ return 0;
uint32 bitbuf[BITMAP_STACKBUF_SIZE/sizeof(uint32)]; bool error= 0;
uint n_fields= table->s->fields; THD *const thd= table->in_use;
my_bool use_bitbuf= n_fields <= sizeof(bitbuf)*8;
/* if (check_table_binlog_row_based(thd, table))
If there are no table maps written to the binary log, this is
the first row handled in this statement. In that case, we need
to write table maps for all locked tables to the binary log.
*/
if (likely(!(error= bitmap_init(&cols,
use_bitbuf ? bitbuf : NULL,
(n_fields + 7) & ~7UL,
false))))
{ {
bitmap_set_all(&cols); MY_BITMAP cols;
if (likely(!(error= write_locked_table_maps(thd)))) /* Potential buffer on the stack for the bitmap */
uint32 bitbuf[BITMAP_STACKBUF_SIZE/sizeof(uint32)];
uint n_fields= table->s->fields;
my_bool use_bitbuf= n_fields <= sizeof(bitbuf)*8;
/*
If there are no table maps written to the binary log, this is
the first row handled in this statement. In that case, we need
to write table maps for all locked tables to the binary log.
*/
if (likely(!(error= bitmap_init(&cols,
use_bitbuf ? bitbuf : NULL,
(n_fields + 7) & ~7UL,
false))))
{ {
error= bitmap_set_all(&cols);
RowsEventT::binlog_row_logging_function(thd, table, if (likely(!(error= write_locked_table_maps(thd))))
table->file->has_transactions(), {
&cols, table->s->fields, error=
before_record, after_record); RowsEventT::binlog_row_logging_function(thd, table,
table->file->has_transactions(),
&cols, table->s->fields,
before_record, after_record);
}
if (!use_bitbuf)
bitmap_free(&cols);
} }
if (!use_bitbuf)
bitmap_free(&cols);
} }
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)