diff options
| author | unknown <jimw@mysql.com> | 2005-04-09 03:05:47 +0200 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-09 03:05:47 +0200 |
| commit | dc2841e6a6ad52476d2b2248729dbc31323c75e0 (patch) | |
| tree | e2c47a9132dbb83fc65d1a868f56e176e24caacd /sql/item_sum.cc | |
| parent | 533b3f0af114e5d84f5bce204b97f16fbbb7cf1f (diff) | |
| download | mariadb-git-dc2841e6a6ad52476d2b2248729dbc31323c75e0.tar.gz | |
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
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |