diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 14:38:27 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 14:38:27 +0200 |
| commit | d54510716e3ed1c497eb45338dbc47dfd0c2d0b2 (patch) | |
| tree | 94a3351755f524f29f7931ba33fbc9438132a82f /include/mysql | |
| parent | fb41117c907a99d051ac09c229762978373d7eb0 (diff) | |
| parent | e51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f (diff) | |
| download | mariadb-git-10.4-MDEV-29988-merge.tar.gz | |
WIP merge 10.3 into 10.410.4-MDEV-29988-merge
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/plugin_ftparser.h | 2 | ||||
| -rw-r--r-- | include/mysql/psi/mysql_thread.h | 2 | ||||
| -rw-r--r-- | include/mysql/service_base64.h | 2 | ||||
| -rw-r--r-- | include/mysql/service_my_snprintf.h | 2 | ||||
| -rw-r--r-- | include/mysql/service_thd_timezone.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/include/mysql/plugin_ftparser.h b/include/mysql/plugin_ftparser.h index 8db8712926f..511b34bb234 100644 --- a/include/mysql/plugin_ftparser.h +++ b/include/mysql/plugin_ftparser.h @@ -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 diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h index eab87402140..06db6890882 100644 --- a/include/mysql/psi/mysql_thread.h +++ b/include/mysql/psi/mysql_thread.h @@ -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. diff --git a/include/mysql/service_base64.h b/include/mysql/service_base64.h index 43b5ba323ba..fa54b4923d4 100644 --- a/include/mysql/service_base64.h +++ b/include/mysql/service_base64.h @@ -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 { diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h index 6757a658fb6..fcc832fc1f1 100644 --- a/include/mysql/service_my_snprintf.h +++ b/include/mysql/service_my_snprintf.h @@ -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; diff --git a/include/mysql/service_thd_timezone.h b/include/mysql/service_thd_timezone.h index 89e75274cf0..667137745f4 100644 --- a/include/mysql/service_thd_timezone.h +++ b/include/mysql/service_thd_timezone.h @@ -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. |