Commit dae1fdd6 authored by marko's avatar marko

branches/zip: Remove the warnings about pointer targets differing

in signedness that were introduced in r2114.

row_upd_index_replace_new_col_vals_index_pos(),
row_upd_index_replace_new_col_vals(): Declare "data" as const byte*
instead of const char*, and add casts to the dtype_get_at_most_n_mbchars()
calls.
parent 95d04ddb
...@@ -930,7 +930,7 @@ row_upd_index_replace_new_col_vals_index_pos( ...@@ -930,7 +930,7 @@ row_upd_index_replace_new_col_vals_index_pos(
if (field->prefix_len > 0) { if (field->prefix_len > 0) {
ulint len ulint len
= dfield_get_len(dfield); = dfield_get_len(dfield);
const char* data const byte* data
= dfield_get_data(dfield); = dfield_get_data(dfield);
ibool fetch_ext ibool fetch_ext
= dfield_is_ext(dfield) = dfield_is_ext(dfield)
...@@ -958,7 +958,7 @@ row_upd_index_replace_new_col_vals_index_pos( ...@@ -958,7 +958,7 @@ row_upd_index_replace_new_col_vals_index_pos(
col->mbminlen, col->mbminlen,
col->mbmaxlen, col->mbmaxlen,
field->prefix_len, field->prefix_len,
len, data); len, (const char*) data);
dfield_set_data(dfield, data, len); dfield_set_data(dfield, data, len);
...@@ -1042,7 +1042,7 @@ row_upd_index_replace_new_col_vals( ...@@ -1042,7 +1042,7 @@ row_upd_index_replace_new_col_vals(
if (field->prefix_len > 0) { if (field->prefix_len > 0) {
ulint len ulint len
= dfield_get_len(dfield); = dfield_get_len(dfield);
const char* data const byte* data
= dfield_get_data(dfield); = dfield_get_data(dfield);
ibool fetch_ext ibool fetch_ext
= dfield_is_ext(dfield) = dfield_is_ext(dfield)
...@@ -1070,7 +1070,7 @@ row_upd_index_replace_new_col_vals( ...@@ -1070,7 +1070,7 @@ row_upd_index_replace_new_col_vals(
col->mbminlen, col->mbminlen,
col->mbmaxlen, col->mbmaxlen,
field->prefix_len, field->prefix_len,
len, data); len, (const char*) data);
dfield_set_data(dfield, data, len); dfield_set_data(dfield, data, len);
......
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