database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Eliminating compiler warnings in the sql/ directory.

Browse Source
This commit is contained in:
mats@romeo.(none)
2007-02-26 18:05:08 +01:00
parent 62f8230938
commit 75be2a8b65
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/log.cc
View File

@@ -138,8 +138,8 @@ public:
*/ */
void truncate(my_off_t pos) void truncate(my_off_t pos)
{ {
DBUG_PRINT("info", ("truncating to position %ld", pos)); DBUG_PRINT("info", ("truncating to position %lu", (ulong) pos));
DBUG_PRINT("info", ("before_stmt_pos=%lu", (void*) pos)); DBUG_PRINT("info", ("before_stmt_pos=%lu", (ulong) pos));
delete pending(); delete pending();
set_pending(0); set_pending(0);
reinit_io_cache(&trans_log, WRITE_CACHE, pos, 0, 0); reinit_io_cache(&trans_log, WRITE_CACHE, pos, 0, 0);
@@ -3466,10 +3466,10 @@ int THD::binlog_flush_transaction_cache()
{ {
DBUG_ENTER("binlog_flush_transaction_cache"); DBUG_ENTER("binlog_flush_transaction_cache");
binlog_trx_data *trx_data= (binlog_trx_data*) ha_data[binlog_hton->slot]; binlog_trx_data *trx_data= (binlog_trx_data*) ha_data[binlog_hton->slot];
DBUG_PRINT("enter", ("trx_data=0x%lu", (void*) trx_data)); DBUG_PRINT("enter", ("trx_data=0x%lu", (ulong) trx_data));
if (trx_data) if (trx_data)
DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%d", DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%lu",
trx_data->before_stmt_pos)); (ulong) trx_data->before_stmt_pos));
/* /*
Write the transaction cache to the binary log. We don't flush and Write the transaction cache to the binary log. We don't flush and

1
sql/log_event.cc
View File

@@ -6402,7 +6402,6 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli)
inside st_relay_log_info::clear_tables_to_lock() by calling the inside st_relay_log_info::clear_tables_to_lock() by calling the
table_def destructor explicitly. table_def destructor explicitly.
*/ */
const table_def *const def=
new (&table_list->m_tabledef) table_def(m_coltype, m_colcnt); new (&table_list->m_tabledef) table_def(m_coltype, m_colcnt);
table_list->m_tabledef_valid= TRUE; table_list->m_tabledef_valid= TRUE;

2
sql/sql_insert.cc
View File

@@ -3189,7 +3189,7 @@ void select_create::send_error(uint errcode,const char *err)
thd->current_stmt_binlog_row_based ? "is" : "is NOT")); thd->current_stmt_binlog_row_based ? "is" : "is NOT"));
DBUG_PRINT("info", DBUG_PRINT("info",
("Current table (at 0x%lu) %s a temporary (or non-existant) table", ("Current table (at 0x%lu) %s a temporary (or non-existant) table",
(void*) table, (ulong) table,
table && !table->s->tmp_table ? "is NOT" : "is")); table && !table->s->tmp_table ? "is NOT" : "is"));
DBUG_PRINT("info", DBUG_PRINT("info",
("Table %s prior to executing this statement", ("Table %s prior to executing this statement",