Merge branch '5.5' into 10.0

This commit is contained in:
Oleksandr Byelkin 2019-01-28 20:52:47 +01:00
commit c4f97d3cfa
11 changed files with 94 additions and 15 deletions

View file

@ -536,7 +536,11 @@
/*
MySQL features
*/
#cmakedefine ENABLED_LOCAL_INFILE 1
#define LOCAL_INFILE_MODE_OFF 0
#define LOCAL_INFILE_MODE_ON 1
#define LOCAL_INFILE_MODE_AUTO 2
#define ENABLED_LOCAL_INFILE LOCAL_INFILE_MODE_@ENABLED_LOCAL_INFILE@
#cmakedefine ENABLED_PROFILING 1
#cmakedefine EXTRA_DEBUG 1
#cmakedefine BACKUP_TEST 1