Commit 48948554 authored by Tor Didriksen's avatar Tor Didriksen

Bug#15960005 VALGRIND WARNINGS IN PROCESS_ARGS

  Both <width> and <precision> can be specified as numbers or '*'.
  If an asterisk is used, an argument of type int is consumed.
parent 6a029022
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
string will be quoted according to MySQL identifier quoting rules. string will be quoted according to MySQL identifier quoting rules.
Both <width> and <precision> can be specified as numbers or '*'. Both <width> and <precision> can be specified as numbers or '*'.
If an asterisk is used, an argument of type int is consumed.
<length modifier> can be 'l', 'll', or 'z'. <length modifier> can be 'l', 'll', or 'z'.
......
...@@ -343,6 +343,7 @@ static char *process_args(CHARSET_INFO *cs, char *to, char *end, ...@@ -343,6 +343,7 @@ static char *process_args(CHARSET_INFO *cs, char *to, char *end,
print_arr[idx].length--; print_arr[idx].length--;
DBUG_ASSERT(*fmt == '$' && print_arr[idx].length < MAX_ARGS); DBUG_ASSERT(*fmt == '$' && print_arr[idx].length < MAX_ARGS);
args_arr[print_arr[idx].length].arg_type= 'd'; args_arr[print_arr[idx].length].arg_type= 'd';
args_arr[print_arr[idx].length].have_longlong= 0;
print_arr[idx].flags|= LENGTH_ARG; print_arr[idx].flags|= LENGTH_ARG;
arg_count= max(arg_count, print_arr[idx].length + 1); arg_count= max(arg_count, print_arr[idx].length + 1);
fmt++; fmt++;
...@@ -361,6 +362,7 @@ static char *process_args(CHARSET_INFO *cs, char *to, char *end, ...@@ -361,6 +362,7 @@ static char *process_args(CHARSET_INFO *cs, char *to, char *end,
print_arr[idx].width--; print_arr[idx].width--;
DBUG_ASSERT(*fmt == '$' && print_arr[idx].width < MAX_ARGS); DBUG_ASSERT(*fmt == '$' && print_arr[idx].width < MAX_ARGS);
args_arr[print_arr[idx].width].arg_type= 'd'; args_arr[print_arr[idx].width].arg_type= 'd';
args_arr[print_arr[idx].width].have_longlong= 0;
print_arr[idx].flags|= WIDTH_ARG; print_arr[idx].flags|= WIDTH_ARG;
arg_count= max(arg_count, print_arr[idx].width + 1); arg_count= max(arg_count, print_arr[idx].width + 1);
fmt++; fmt++;
......
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