Commit 175507b7 authored by unknown's avatar unknown
Browse files

Fixes for compiler warnings. 


include/my_dbug.h:
  Added macro for fixing compiler warnings.
sql/field.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster.cc:
  Fixed compiler warnings.
sql/ha_ndbcluster_binlog.cc:
  Fixed compiler warnings.
  Changed some tabs into spaces.
sql/rpl_injector.h:
  Fixed compiler warnings.
sql/sql_binlog.cc:
  Fixed compiler warnings.
sql/sql_repl.cc:
  Fixed compiler warnings.
sql/sql_table.cc:
  Fixed compiler warnings.
storage/myisammrg/ha_myisammrg.cc:
  Fixed compiler warnings.
strings/ctype-ucs2.c:
  Fixed compiler warnings.
strings/ctype-utf8.c:
  Fixed compiler warnings.
support-files/compiler_warnings.supp:
  Added suppressed warnings.
parent 1eb71c68

include/my_dbug.h

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ extern FILE *_db_fp_(void); 
#define DBUG_ASSERT(A) assert(A)

#define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))

#define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))

#define IF_DBUG(A) A

#else						/* No debugger */



#define DBUG_ENTER(a1)
@@ -106,6 +107,7 @@ extern FILE *_db_fp_(void); 
#define DBUG_UNLOCK_FILE

#define DBUG_EXPLAIN(buf,len)

#define DBUG_EXPLAIN_INITIAL(buf,len)

#define IF_DBUG(A)

#endif

#ifdef	__cplusplus

}

sql/field.cc

+2 −0
Original line number Diff line number Diff line
@@ -6297,10 +6297,12 @@ int Field_string::cmp(const char *a_ptr, const char *b_ptr) 


void Field_string::sort_string(char *to,uint length)

{

#ifndef DBUG_OFF

  uint tmp= my_strnxfrm(field_charset,

                        (uchar*) to, length,

                        (uchar*) ptr, field_length);

  DBUG_ASSERT(tmp == length);

#endif

}

sql/ha_ndbcluster.cc

+20 −13
Original line number Diff line number Diff line
@@ -2764,10 +2764,12 @@ int ha_ndbcluster::write_row(byte *record) 
  {

    Ndb *ndb= get_ndb();

    Uint64 next_val= (Uint64) table->next_number_field->val_int() + 1;

#ifndef DBUG_OFF

    char buff[22];

    DBUG_PRINT("info", 

               ("Trying to set next auto increment value to %s",

                llstr(next_val, buff)));

#endif

    Ndb_tuple_id_range_guard g(m_share);

    if (ndb->setAutoIncrementValue(m_table, g.range, next_val, TRUE)

        == -1)
@@ -3999,7 +4001,7 @@ int ha_ndbcluster::end_bulk_insert() 
      }

      else

      {

        int res= trans->restart();

        IF_DBUG(int res=) trans->restart();

        DBUG_ASSERT(res == 0);

      }

    }
@@ -4717,7 +4719,7 @@ static int create_ndb_column(NDBCOL &col, 
  // Set autoincrement

  if (field->flags & AUTO_INCREMENT_FLAG) 

  {

    char buff[22];

    IF_DBUG(char buff[22]);

    col.setAutoIncrement(TRUE);

    ulonglong value= info->auto_increment_value ?

      info->auto_increment_value : (ulonglong) 1;
@@ -5388,7 +5390,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
  {

    DBUG_PRINT("NDB_SHARE", ("%s temporary  use_count: %u",

                             share->key, share->use_count));

    int r= rename_share(share, to);

    IF_DBUG(int r=) rename_share(share, to);

    DBUG_ASSERT(r == 0);

  }

#endif
@@ -5409,7 +5411,7 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) 
#ifdef HAVE_NDB_BINLOG

    if (share)

    {

      int r= rename_share(share, from);

      IF_DBUG(int r=) rename_share(share, from);

      DBUG_ASSERT(r == 0);

      /* ndb_share reference temporary free */

      DBUG_PRINT("NDB_SHARE", ("%s temporary free  use_count: %u",
@@ -7268,7 +7270,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname, 
    if (share->commit_count != 0)

    {

      *commit_count= share->commit_count;

      char buff[22];

      IF_DBUG(char buff[22]);

      DBUG_PRINT("info", ("Getting commit_count: %s from share",

                          llstr(share->commit_count, buff)));

      pthread_mutex_unlock(&share->mutex);
@@ -7304,7 +7306,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname, 
  pthread_mutex_lock(&share->mutex);

  if (share->commit_count_lock == lock)

  {

    char buff[22];

    IF_DBUG(char buff[22]);

    DBUG_PRINT("info", ("Setting commit_count to %s",

                        llstr(stat.commit_count, buff)));

    share->commit_count= stat.commit_count;
@@ -7363,7 +7365,8 @@ ndbcluster_cache_retrieval_allowed(THD *thd, 
  bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));

  char *dbname= full_name;

  char *tabname= dbname+strlen(dbname)+1;

  char buff[22], buff2[22];

  IF_DBUG(char buff[22]);

  IF_DBUG(char buff2[22]);

  DBUG_ENTER("ndbcluster_cache_retrieval_allowed");

  DBUG_PRINT("enter", ("dbname: %s, tabname: %s, is_autocommit: %d",

                       dbname, tabname, is_autocommit));
@@ -7430,7 +7433,7 @@ ha_ndbcluster::register_query_cache_table(THD *thd, 
                                          ulonglong *engine_data)

{

  Uint64 commit_count;

  char buff[22];

  IF_DBUG(char buff[22]);

  bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));

  DBUG_ENTER("ha_ndbcluster::register_query_cache_table");

  DBUG_PRINT("enter",("dbname: %s, tabname: %s, is_autocommit: %d",
@@ -7875,7 +7878,10 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, const 
  int retries= 10;

  int reterr= 0;

  int retry_sleep= 30 * 1000; /* 30 milliseconds */

  char buff[22], buff2[22], buff3[22], buff4[22];

  IF_DBUG(char buff[22]);

  IF_DBUG(char buff2[22]);

  IF_DBUG(char buff3[22]);

  IF_DBUG(char buff4[22]);

  DBUG_ENTER("ndb_get_table_statistics");

  DBUG_PRINT("enter", ("table: %s", ndbtab->getName()));
@@ -8693,7 +8699,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) 
            ndb_get_table_statistics(NULL, FALSE, ndb,

                                     ndbtab_g.get_table(), &stat) == 0)

        {

          char buff[22], buff2[22];

          IF_DBUG(char buff[22]);

	  IF_DBUG(char buff2[22]);

          DBUG_PRINT("info",

                     ("Table: %s  commit_count: %s  rows: %s",

                      share->key,
@@ -9545,7 +9552,7 @@ void ndb_serialize_cond(const Item *item, void *arg) 
          DBUG_PRINT("info", ("INT_ITEM"));

          if (context->expecting(Item::INT_ITEM)) 

          {

            Item_int *int_item= (Item_int *) item;      

            IF_DBUG(Item_int *int_item= (Item_int *) item);

            DBUG_PRINT("info", ("value %ld", (long) int_item->value));

            NDB_ITEM_QUALIFICATION q;

            q.value_type= Item::INT_ITEM;
@@ -9572,7 +9579,7 @@ void ndb_serialize_cond(const Item *item, void *arg) 
          DBUG_PRINT("info", ("REAL_ITEM"));

          if (context->expecting(Item::REAL_ITEM)) 

          {

            Item_float *float_item= (Item_float *) item;      

            IF_DBUG(Item_float *float_item= (Item_float *) item);

            DBUG_PRINT("info", ("value %f", float_item->value));

            NDB_ITEM_QUALIFICATION q;

            q.value_type= Item::REAL_ITEM;
@@ -9620,7 +9627,7 @@ void ndb_serialize_cond(const Item *item, void *arg) 
          DBUG_PRINT("info", ("DECIMAL_ITEM"));

          if (context->expecting(Item::DECIMAL_ITEM)) 

          {

            Item_decimal *decimal_item= (Item_decimal *) item;      

            IF_DBUG(Item_decimal *decimal_item= (Item_decimal *) item);

            DBUG_PRINT("info", ("value %f", decimal_item->val_real()));

            NDB_ITEM_QUALIFICATION q;

            q.value_type= Item::DECIMAL_ITEM;

sql/ha_ndbcluster_binlog.cc

+71 −64
Original line number Diff line number Diff line
@@ -3225,14 +3225,16 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, 
      if (share->flags & NSF_BLOB_FLAG)

      {

        my_ptrdiff_t ptrdiff= 0;

        int ret= get_ndb_blobs_value(table, share->ndb_value[0],

                                     blobs_buffer[0], blobs_buffer_size[0],

        IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[0],

                                               blobs_buffer[0],

                                               blobs_buffer_size[0],

                                               ptrdiff);

        DBUG_ASSERT(ret == 0);

      }

      ndb_unpack_record(table, share->ndb_value[0], &b, table->record[0]);

      int ret= trans.write_row(::server_id,

                               injector::transaction::table(table, TRUE),

      IF_DBUG(int ret=) trans.write_row(::server_id,

                                        injector::transaction::table(table,

                                                                     TRUE),

                                        &b, n_fields, table->record[0]);

      DBUG_ASSERT(ret == 0);

    }
@@ -3262,15 +3264,17 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, 
      if (share->flags & NSF_BLOB_FLAG)

      {

        my_ptrdiff_t ptrdiff= table->record[n] - table->record[0];

        int ret= get_ndb_blobs_value(table, share->ndb_value[n],

                                     blobs_buffer[n], blobs_buffer_size[n],

        IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[n],

                                               blobs_buffer[n],

                                               blobs_buffer_size[n],

                                               ptrdiff);

        DBUG_ASSERT(ret == 0);

      }

      ndb_unpack_record(table, share->ndb_value[n], &b, table->record[n]);

      DBUG_EXECUTE("info", print_records(table, table->record[n]););

      int ret= trans.delete_row(::server_id,

                                injector::transaction::table(table, TRUE),

      IF_DBUG(int ret =) trans.delete_row(::server_id,

                                          injector::transaction::table(table,

                                                                       TRUE),

                                          &b, n_fields, table->record[n]);

      DBUG_ASSERT(ret == 0);

    }
@@ -3283,8 +3287,9 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, 
      if (share->flags & NSF_BLOB_FLAG)

      {

        my_ptrdiff_t ptrdiff= 0;

        int ret= get_ndb_blobs_value(table, share->ndb_value[0],

                                     blobs_buffer[0], blobs_buffer_size[0],

        IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[0],

                                               blobs_buffer[0],

                                               blobs_buffer_size[0],

                                               ptrdiff);

        DBUG_ASSERT(ret == 0);

      }
@@ -3309,15 +3314,17 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, 
        if (share->flags & NSF_BLOB_FLAG)

        {

          my_ptrdiff_t ptrdiff= table->record[1] - table->record[0];

          int ret= get_ndb_blobs_value(table, share->ndb_value[1],

                                       blobs_buffer[1], blobs_buffer_size[1],

          IF_DBUG(int ret =) get_ndb_blobs_value(table, share->ndb_value[1],

                                                 blobs_buffer[1],

                                                 blobs_buffer_size[1],

                                                 ptrdiff);

          DBUG_ASSERT(ret == 0);

        }

        ndb_unpack_record(table, share->ndb_value[1], &b, table->record[1]);

        DBUG_EXECUTE("info", print_records(table, table->record[1]););

        int ret= trans.update_row(::server_id,

                                  injector::transaction::table(table, TRUE),

        IF_DBUG(int ret =) trans.update_row(::server_id,

                                            injector::transaction::table(table,

                                                                         TRUE),

                                            &b, n_fields,

                                            table->record[1], // before values

                                            table->record[0]);// after values
@@ -3850,7 +3857,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
              continue;

            }

            TABLE *table= share->table;

            const LEX_STRING &name= table->s->table_name;

            IF_DBUG(const LEX_STRING &name= table->s->table_name);

            if ((event_types & (NdbDictionary::Event::TE_INSERT |

                                NdbDictionary::Event::TE_UPDATE |

                                NdbDictionary::Event::TE_DELETE)) == 0)
@@ -3867,7 +3874,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
            }

            DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str));

            injector::transaction::table tbl(table, TRUE);

            int ret= trans.use_table(::server_id, tbl);

            IF_DBUG(int ret=) trans.use_table(::server_id, tbl);

            DBUG_ASSERT(ret == 0);

          }

        }
@@ -3877,10 +3884,10 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
          {

            TABLE *table= ndb_apply_status_share->table;



            const LEX_STRING& name=table->s->table_name;

            IF_DBUG(const LEX_STRING& name= table->s->table_name);

            DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str));

            injector::transaction::table tbl(table, TRUE);

            int ret= trans.use_table(::server_id, tbl);

            IF_DBUG(int ret=) trans.use_table(::server_id, tbl);

            DBUG_ASSERT(ret == 0);



            // Set all fields non-null.
@@ -3945,7 +3952,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
          else

          {

            // set injector_ndb database/schema from table internal name

            int ret=

            IF_DBUG(int ret=)

              i_ndb->setDatabaseAndSchemaName(pOp->getEvent()->getTable());

            DBUG_ASSERT(ret == 0);

            ndb_binlog_thread_handle_non_data_event(thd, i_ndb, pOp, row);

sql/rpl_injector.h

+2 −0
Original line number Diff line number Diff line
@@ -284,12 +284,14 @@ class injector 
       */

      int check_state(enum_state const target_state)

      {

#ifndef DBUG_OFF

        static char const *state_name[] = {

          "START_STATE", "TABLE_STATE", "ROW_STATE", "STATE_COUNT"

        };



        DBUG_ASSERT(0 <= target_state && target_state <= STATE_COUNT);

        DBUG_PRINT("info", ("In state %s", state_name[m_state]));

#endif



        if (m_state <= target_state && target_state <= m_state + 1 &&

            m_state < STATE_COUNT)