diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 12:14:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 12:14:13 +0300 |
| commit | a992c615a66341ec4c86d0f97fcdb36e3b837a54 (patch) | |
| tree | de1e5af122d35443a964c10d68c287022da084f6 /config.h.cmake | |
| parent | 15edd69ddf649ebf7ecab3fa72bc5dea263c0154 (diff) | |
| parent | 977c385df36dcb751720dc838521b7cb5a328cb9 (diff) | |
| download | mariadb-git-a992c615a66341ec4c86d0f97fcdb36e3b837a54.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config.h.cmake b/config.h.cmake index 224cbb82b16..df240380471 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -255,9 +255,6 @@ #cmakedefine STRUCT_TIMESPEC_HAS_TV_SEC 1 #cmakedefine STRUCT_TIMESPEC_HAS_TV_NSEC 1 -#define USE_MB 1 -#define USE_MB_IDENT 1 - /* this means that valgrind headers and macros are available */ #cmakedefine HAVE_VALGRIND_MEMCHECK_H 1 @@ -453,8 +450,8 @@ #cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@" #cmakedefine MYSQL_DEFAULT_COLLATION_NAME "@MYSQL_DEFAULT_COLLATION_NAME@" -#cmakedefine USE_MB 1 -#cmakedefine USE_MB_IDENT 1 +#cmakedefine USE_MB +#cmakedefine USE_MB_IDENT /* This should mean case insensitive file system */ #cmakedefine FN_NO_CASE_SENSE 1 |