Commit dc2841e6 authored by unknown's avatar unknown

Fix warning and error when compiling on Windows.


sql/item_sum.cc:
  Cast byte* to char* for creating String
sql/field.cc:
  Add missing parameter for logging warning
parent 533b3f0a
...@@ -5573,7 +5573,7 @@ int Field_datetime::store(longlong nr) ...@@ -5573,7 +5573,7 @@ int Field_datetime::store(longlong nr)
{ {
set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARN_DATA_OUT_OF_RANGE, ER_WARN_DATA_OUT_OF_RANGE,
initial_nr, MYSQL_TIMESTAMP_DATE); initial_nr, MYSQL_TIMESTAMP_DATE, 1);
error= 1; error= 1;
} }
......
...@@ -2670,7 +2670,7 @@ int dump_leaf_key(byte* key, element_count count __attribute__((unused)), ...@@ -2670,7 +2670,7 @@ int dump_leaf_key(byte* key, element_count count __attribute__((unused)),
{ {
TABLE *table= item->table; TABLE *table= item->table;
char *record= (char*) table->record[0] + table->s->null_bytes; char *record= (char*) table->record[0] + table->s->null_bytes;
String tmp(table->record[1], table->s->reclength, default_charset_info), tmp2; String tmp((char *)table->record[1], table->s->reclength, default_charset_info), tmp2;
String *result= &item->result; String *result= &item->result;
Item **arg= item->args, **arg_end= item->args + item->arg_count_field; Item **arg= item->args, **arg_end= item->args + item->arg_count_field;
......
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