Silence warning due to copying the address of a string constant

into a non-const string pointer.
parent cd2d5b19
...@@ -5597,6 +5597,8 @@ void fix_win_paths(const char *val, int len) ...@@ -5597,6 +5597,8 @@ void fix_win_paths(const char *val, int len)
void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field, void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field,
char* val, ulonglong len, my_bool is_null) char* val, ulonglong len, my_bool is_null)
{ {
char null[]= "NULL";
if (col_idx < max_replace_column && replace_column[col_idx]) if (col_idx < max_replace_column && replace_column[col_idx])
{ {
val= replace_column[col_idx]; val= replace_column[col_idx];
...@@ -5604,7 +5606,7 @@ void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field, ...@@ -5604,7 +5606,7 @@ void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field,
} }
else if (is_null) else if (is_null)
{ {
val= "NULL"; val= null;
len= 4; len= 4;
} }
#ifdef __WIN__ #ifdef __WIN__
......
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