database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge with mysql-5.5.30 minus few incorrect or not applicable changesets

Browse Source
This commit is contained in:
Sergei Golubchik
2013-02-28 18:42:49 +01:00
parent 154aac8eb0 31c06437c9
commit 8161c6772d
178 changed files with 3572 additions and 2050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
strings/my_vsnprintf.c
View File

@ -343,6 +343,7 @@ start:
print_arr[idx].length--;
DBUG_ASSERT(*fmt == '$' && print_arr[idx].length < MAX_ARGS);
args_arr[print_arr[idx].length].arg_type= 'd';
args_arr[print_arr[idx].length].have_longlong= 0;
print_arr[idx].flags|= LENGTH_ARG;
arg_count= max(arg_count, print_arr[idx].length + 1);
fmt++;
@ -361,6 +362,7 @@ start:
print_arr[idx].width--;
DBUG_ASSERT(*fmt == '$' && print_arr[idx].width < MAX_ARGS);
args_arr[print_arr[idx].width].arg_type= 'd';
args_arr[print_arr[idx].width].have_longlong= 0;
print_arr[idx].flags|= WIDTH_ARG;
arg_count= max(arg_count, print_arr[idx].width + 1);
fmt++;