diff options
| -rw-r--r-- | sql/field.cc | 2 | ||||
| -rw-r--r-- | sql/item_sum.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 3afc8a2eb12..e5134593d32 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -5573,7 +5573,7 @@ int Field_datetime::store(longlong nr) { set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, - initial_nr, MYSQL_TIMESTAMP_DATE); + initial_nr, MYSQL_TIMESTAMP_DATE, 1); error= 1; } diff --git a/sql/item_sum.cc b/sql/item_sum.cc index e4eac51eff7..64f23c3fc08 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2670,7 +2670,7 @@ int dump_leaf_key(byte* key, element_count count __attribute__((unused)), { TABLE *table= item->table; 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; Item **arg= item->args, **arg_end= item->args + item->arg_count_field; |