database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.11 into 11.4

Browse Source
This commit is contained in:
Sergei Golubchik
2025-01-30 11:59:53 +01:00
parent 5be38d14fc e69f8cae1a
commit 7d657fda64
344 changed files with 9076 additions and 2409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mysql/plugin.h
View File

@@ -44,7 +44,8 @@ class THD;
class Item;
#define MYSQL_THD THD*
#else
#define MYSQL_THD void*
struct THD;
typedef struct THD* MYSQL_THD;
#endif
typedef char my_bool;

4
include/mysql/psi/mysql_file.h
View File

@@ -1018,7 +1018,7 @@ inline_mysql_file_create(
#ifdef HAVE_PSI_FILE_INTERFACE
PSI_file_key key, const char *src_file, uint src_line,
#endif
const char *filename, int create_flags, int access_flags, myf myFlags)
const char *filename, mode_t create_flags, int access_flags, myf myFlags)
{
File file;
#ifdef HAVE_PSI_FILE_INTERFACE
@@ -1344,7 +1344,7 @@ inline_mysql_file_create_with_symlink(
#ifdef HAVE_PSI_FILE_INTERFACE
PSI_file_key key, const char *src_file, uint src_line,
#endif
const char *linkname, const char *filename, int create_flags,
const char *linkname, const char *filename, mode_t create_flags,
int access_flags, myf flags)
{
File file;

4
include/mysql/service_debug_sync.h
View File

@@ -351,7 +351,11 @@ extern void (*debug_sync_C_callback_ptr)(MYSQL_THD, const char *, size_t);
#endif /* defined(ENABLED_DEBUG_SYNC) */
/* compatibility macro */
#ifdef __cplusplus
#define DEBUG_SYNC_C(name) DEBUG_SYNC(nullptr, name)
#else
#define DEBUG_SYNC_C(name) DEBUG_SYNC(NULL, name)
#endif
#ifdef __cplusplus
}