diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 11:29:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 11:29:32 +0300 |
| commit | 977c385df36dcb751720dc838521b7cb5a328cb9 (patch) | |
| tree | 039c8cf3e0f41bc0a1ab81eef17a4700111fbe59 /config.h.cmake | |
| parent | fa0cada95baeb9fad5a2d6dad687bb13c93da9b6 (diff) | |
| parent | 2aab7f2d0a6555f7ebb6dcde243639354ca5da53 (diff) | |
| download | mariadb-git-977c385df36dcb751720dc838521b7cb5a328cb9.tar.gz | |
Merge 10.4 into 10.5
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 404d654ace6..a8154bb18d1 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 |