diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
| commit | 99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b (patch) | |
| tree | 121d54271137b00d58b23505644be3bc3a819a9e /include | |
| parent | cda072bb4ba9e01d523d8deb995f28aa7a19fe11 (diff) | |
| parent | a736a3174a4e7c0d92a38901ae61f563d4afede7 (diff) | |
| download | mariadb-git-99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/ft_global.h | 3 | ||||
| -rw-r--r-- | include/my_context.h | 3 | ||||
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index 725363c3aa8..9f2d52610ba 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -90,7 +90,8 @@ void ft_free_stopwords(void); FT_INFO *ft_init_search(uint,void *, uint, uchar *, size_t, CHARSET_INFO *, uchar *); -my_bool ft_boolean_check_syntax_string(const uchar *); +my_bool ft_boolean_check_syntax_string(const uchar *, size_t length, + CHARSET_INFO *cs); /* Internal symbols for fulltext between maria and MyISAM */ diff --git a/include/my_context.h b/include/my_context.h index ea0e3496887..45d2a7d7ffa 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -52,6 +52,9 @@ struct my_context { #ifdef MY_CONTEXT_USE_UCONTEXT +#if defined(__APPLE__) && !defined(_XOPEN_SOURCE) +#define _XOPEN_SOURCE +#endif #include <ucontext.h> struct my_context { diff --git a/include/my_global.h b/include/my_global.h index da0d9920e06..1d7c91f37b8 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,6 +1,6 @@ /* Copyright (c) 2001, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2019, MariaDB Corporation. + Copyright (c) 2009, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/mysql_com.h b/include/mysql_com.h index 78d9a5f3494..eb2ee7410d8 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -197,13 +197,13 @@ enum enum_indicator_type #define FIELD_FLAGS_COLUMN_FORMAT_MASK (3U << FIELD_FLAGS_COLUMN_FORMAT) #define FIELD_IS_DROPPED (1U << 26) /* Intern: Field is being dropped */ -#define VERS_SYS_START_FLAG (1 << 27) /* autogenerated column declared with +#define VERS_ROW_START (1 << 27) /* autogenerated column declared with `generated always as row start` (see II.a SQL Standard) */ -#define VERS_SYS_END_FLAG (1 << 28) /* autogenerated column declared with +#define VERS_ROW_END (1 << 28) /* autogenerated column declared with `generated always as row end` (see II.a SQL Standard).*/ -#define VERS_SYSTEM_FIELD (VERS_SYS_START_FLAG | VERS_SYS_END_FLAG) +#define VERS_SYSTEM_FIELD (VERS_ROW_START | VERS_ROW_END) #define VERS_UPDATE_UNVERSIONED_FLAG (1 << 29) /* column that doesn't support system versioning when table itself supports it*/ |