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

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-07-05 17:43:32 +04:00
parent a4d9fa99ea 58dd72f18c
commit 3b9273d203
189 changed files with 3959 additions and 4286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/sql/mf_iocache-t.cc
View File

@ -93,7 +93,7 @@ IO_CACHE info;
#define CACHE_SIZE 16384
#define INFO_TAIL ", pos_in_file = %llu, pos_in_mem = %lu", \
info.pos_in_file, (ulong) (*info.current_pos - info.request_pos)
info.pos_in_file, (ulong) ((info.type == READ_CACHE ? info.read_pos : info.write_pos) - info.request_pos)
#define FILL 0x5A