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 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-03 16:10:02 +02:00
parent fb41117c90 8760f6907c
commit fb0808c450
149 changed files with 2784 additions and 1991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql/plugin_ftparser.h
View File

@@ -101,7 +101,7 @@ enum enum_ft_token_type
<0 Must not be present
0 Neither; the word is optional but its presence increases the relevance
With the default settings of the ft_boolean_syntax system variable,
>0 corresponds to the '+' operator, <0 corrresponds to the '-' operator,
>0 corresponds to the '+' operator, <0 corresponds to the '-' operator,
and 0 means neither operator was used.
weight_adjust: A weighting factor that determines how much a match

2
include/mysql/psi/mysql_thread.h
View File

@@ -588,7 +588,7 @@ typedef struct st_mysql_cond mysql_cond_t;
This function creates both the thread instrumentation and a thread.
@c mysql_thread_create is a replacement for @c pthread_create.
The parameter P4 (or, if it is NULL, P1) will be used as the
instrumented thread "indentity".
instrumented thread "identity".
Providing a P1 / P4 parameter with a different value for each call
will on average improve performances, since this thread identity value
is used internally to randomize access to data and prevent contention.

2
include/mysql/service_base64.h
View File

@@ -29,7 +29,7 @@ extern "C" {
#include <stdlib.h>
#endif
/* Allow multuple chunks 'AAA= AA== AA==', binlog uses this */
/* Allow multiple chunks 'AAA= AA== AA==', binlog uses this */
#define MY_BASE64_DECODE_ALLOW_MULTIPLE_CHUNKS 1
extern struct base64_service_st {

2
include/mysql/service_my_snprintf.h
View File

@@ -40,7 +40,7 @@
@post
The syntax of a format string is generally the same:
% <flag> <width> <precision> <length modifier> <format>
where everithing but the format is optional.
where everything but the format is optional.
Three one-character flags are recognized:
'0' has the standard zero-padding semantics;

2
include/mysql/service_thd_timezone.h
View File

@@ -16,7 +16,7 @@
/**
@file
This service provdes functions to convert between my_time_t and
This service provides functions to convert between my_time_t and
MYSQL_TIME taking into account the current value of the time_zone
session variable.