diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 13:00:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 13:00:15 +0200 |
| commit | 213ece2f2e8c23ee0e727cc02dcecfae6f510ca2 (patch) | |
| tree | 5ce93ecb5caa9a58ebc08f8cd3e94c59d7219377 /config.h.cmake | |
| parent | c1e1764fc4b913ee688b383aac2698b83661d64c (diff) | |
| parent | d9d83f1d92b696ef56f4944df036b8a78364ebb4 (diff) | |
| download | mariadb-git-213ece2f2e8c23ee0e727cc02dcecfae6f510ca2.tar.gz | |
Merge 10.1 into 10.1
This is joint work with Oleksandr Byelkin.
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index 52d837fad2a..3750ab717f8 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -544,7 +544,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 CYBOZU 1 |