Commit c140b92c authored by unknown's avatar unknown
Browse files

Eliminating compiler warnings in the sql/ directory. 


sql/log.cc:
  Eliminating some warning from incompatible arguments to DBUG_PRINT().
sql/log_event.cc:
  Eliminating unused auto variable.
sql/sql_insert.cc:
  Eliminating some warning from incompatible arguments to DBUG_PRINT().
parent 236bb807

sql/log.cc

+5 −5
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ class binlog_trx_data { 
   */

  void truncate(my_off_t pos)

  {

    DBUG_PRINT("info", ("truncating to position %ld", pos));

    DBUG_PRINT("info", ("before_stmt_pos=%lu", (void*) pos));

    DBUG_PRINT("info", ("truncating to position %lu", (ulong) pos));

    DBUG_PRINT("info", ("before_stmt_pos=%lu", (ulong) pos));

    delete pending();

    set_pending(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");

  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)

    DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%d",

                         trx_data->before_stmt_pos));

    DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%lu",

                         (ulong) trx_data->before_stmt_pos));



  /*

    Write the transaction cache to the binary log.  We don't flush and

sql/log_event.cc

+1 −2
Original line number Diff line number Diff line
@@ -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

      table_def destructor explicitly.

    */

    const table_def *const def=

    new (&table_list->m_tabledef) table_def(m_coltype, m_colcnt);

    table_list->m_tabledef_valid= TRUE;

sql/sql_insert.cc

+1 −1
Original line number Diff line number Diff line
@@ -3189,7 +3189,7 @@ void select_create::send_error(uint errcode,const char *err) 
              thd->current_stmt_binlog_row_based ? "is" : "is NOT"));

  DBUG_PRINT("info",

             ("Current table (at 0x%lu) %s a temporary (or non-existant) table",

              (void*) table,

              (ulong) table,

              table && !table->s->tmp_table ? "is NOT" : "is"));

  DBUG_PRINT("info",

             ("Table %s prior to executing this statement",