Commit 4ec86b1c authored by unknown's avatar unknown
Browse files

This is a cleanup of warnings that windows is complaining about. 


client/mysql.cc:
  Windows warnings clean up
server-tools/instance-manager/parse.cc:
  Cleanedup warning
sql/field.cc:
  Removed unused variables
sql/filesort.cc:
  Removed unused variables
sql/ha_innodb.cc:
  Removed unused variables
sql/ha_partition.cc:
  Fixing warning
sql/partition_element.h:
  Fixing declaration for warnings
parent fb47d658

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -2353,7 +2353,6 @@ print_table_data(MYSQL_RES *result) 
      const char *buffer;

      uint data_length;

      uint field_max_length;

      bool right_justified;

      uint visible_length;

      uint extra_padding;

server-tools/instance-manager/parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static bool parse_long(const LEX_STRING *token, long *value) 
  int err_code;

  char *end_ptr= token->str + token->length;



  *value= my_strtoll10(token->str, &end_ptr, &err_code);

  *value= (long)my_strtoll10(token->str, &end_ptr, &err_code);



  return err_code != 0;

}

sql/field.cc

+2 −3
Original line number Diff line number Diff line
@@ -9145,10 +9145,9 @@ create_field::create_field(Field *old_field,Field *orig_field) 
       old_field->table->timestamp_field != old_field ||  /* timestamp field */ 

       unireg_check == Field::TIMESTAMP_UN_FIELD))        /* has default val */

  {

    char buff[MAX_FIELD_WIDTH],*pos;

    String tmp(buff,sizeof(buff), charset), *res;

    char buff[MAX_FIELD_WIDTH];

    String tmp(buff,sizeof(buff), charset);

    my_ptrdiff_t diff;

    bool is_null;



    /* Get the value from default_values */

    diff= (my_ptrdiff_t) (orig_field->table->s->default_values-

sql/filesort.cc

+0 −1
Original line number Diff line number Diff line
@@ -886,7 +886,6 @@ static void make_sortkey(register SORTPARAM *param, 
static void register_used_fields(SORTPARAM *param)

{

  reg1 SORT_FIELD *sort_field;

  reg5 uint length;

  TABLE *table=param->sort_form;

  MY_BITMAP *bitmap= table->read_set;

sql/ha_innodb.cc

+0 −1
Original line number Diff line number Diff line
@@ -2915,7 +2915,6 @@ ha_innobase::store_key_val_for_row( 


			CHARSET_INFO*	cs;

			ulint		key_len;

			ulint		len;

			ulint		true_len;

			int		error=0;

			ulint		blob_len;