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

This commit is contained in:
Alexander Barkov 2017-10-02 22:35:13 +04:00
commit 8ae8cd6348
288 changed files with 1987 additions and 2427 deletions

View file

@ -45,7 +45,7 @@
// end_read_record
#include "sql_partition.h" // make_used_partitions_str
#define MEM_STRIP_BUF_SIZE thd->variables.sortbuff_size
#define MEM_STRIP_BUF_SIZE ((size_t) thd->variables.sortbuff_size)
/*
@brief