Commit d4118813 authored by brian@zim.(none)'s avatar brian@zim.(none)

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

parent 212ab976
......@@ -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;
......
......@@ -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;
}
......
......@@ -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-
......
......@@ -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;
......
......@@ -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;
......
......@@ -361,7 +361,7 @@ bool ha_partition::initialise_partition(MEM_ROOT *mem_root)
HA_CAN_GEOMETRY, HA_CAN_FULLTEXT, HA_CAN_SQL_HANDLER, HA_DUPLICATE_POS,
HA_CAN_INSERT_DELAYED is disabled until further investigated.
*/
m_table_flags= m_file[0]->table_flags();
m_table_flags= (ulong)m_file[0]->table_flags();
m_low_byte_first= m_file[0]->low_byte_first();
m_pkey_is_clustered= TRUE;
file_array= m_file;
......
......@@ -56,8 +56,8 @@ class partition_element :public Sql_alloc {
public:
List<partition_element> subpartitions;
List<part_elem_value> list_val_list;
ulonglong part_max_rows;
ulonglong part_min_rows;
ha_rows part_max_rows;
ha_rows part_min_rows;
longlong range_value;
char *partition_name;
char *tablespace_name;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment