summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlilinjie <lilinjie@uniontech.com>2023-01-12 10:38:38 +0800
committerDaniel Black <daniel@mariadb.org>2023-01-12 14:02:20 +1100
commiteb145e5ad7afa29f1d298452b80fcca36a6c3bbe (patch)
treea5d0620945e893f807ec7756984c82c4d1525d90
parentb194c83b7bd2f4e861fdce041a9ea3de18f4d227 (diff)
downloadmariadb-git-eb145e5ad7afa29f1d298452b80fcca36a6c3bbe.tar.gz
fix typos
Signed-off-by: lilinjie <lilinjie@uniontech.com>
-rw-r--r--scripts/mysqlaccess.sh2
-rw-r--r--sql/opt_range.h8
-rw-r--r--sql/sql_cache.h2
-rw-r--r--sql/sys_vars.cc2
-rw-r--r--storage/perfschema/pfs_timer.cc4
5 files changed, 9 insertions, 9 deletions
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index aaf711b0fb9..83118a8fdc6 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -584,7 +584,7 @@ if ($MySQLaccess::CGI) { #CGI-version
# ----------------------
# brief and table-format
# exclude each-other
-# table-format is prefered
+# table-format is preferred
if (defined($Param{'table'})) { undef($Param{'brief'}); }
if (defined($Param{'preview'}) or
defined($Param{'copy'}) or
diff --git a/sql/opt_range.h b/sql/opt_range.h
index 84b1cd08ba8..fd883547cb3 100644
--- a/sql/opt_range.h
+++ b/sql/opt_range.h
@@ -711,7 +711,7 @@ class QUICK_RANGE :public Sql_alloc {
}
/**
- Initalizes a key_range object for communication with storage engine.
+ Initializes a key_range object for communication with storage engine.
This function facilitates communication with the Storage Engine API by
translating the minimum endpoint of the interval represented by this
@@ -732,7 +732,7 @@ class QUICK_RANGE :public Sql_alloc {
}
/**
- Initalizes a key_range object for communication with storage engine.
+ Initializes a key_range object for communication with storage engine.
This function facilitates communication with the Storage Engine API by
translating the minimum endpoint of the interval represented by this
@@ -749,7 +749,7 @@ class QUICK_RANGE :public Sql_alloc {
}
/**
- Initalizes a key_range object for communication with storage engine.
+ Initializes a key_range object for communication with storage engine.
This function facilitates communication with the Storage Engine API by
translating the maximum endpoint of the interval represented by this
@@ -770,7 +770,7 @@ class QUICK_RANGE :public Sql_alloc {
}
/**
- Initalizes a key_range object for communication with storage engine.
+ Initializes a key_range object for communication with storage engine.
This function facilitates communication with the Storage Engine API by
translating the maximum endpoint of the interval represented by this
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index d59bc37b7a3..d89bcda2491 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -32,7 +32,7 @@ typedef struct st_changed_table_list CHANGED_TABLE_LIST;
Can't create new free memory block if unused memory in block less
then QUERY_CACHE_MIN_ALLOCATION_UNIT.
if QUERY_CACHE_MIN_ALLOCATION_UNIT == 0 then
- QUERY_CACHE_MIN_ALLOCATION_UNIT choosed automaticaly
+ QUERY_CACHE_MIN_ALLOCATION_UNIT choosed automatically
*/
#define QUERY_CACHE_MIN_ALLOCATION_UNIT 512
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index d5164587900..44bea7b4581 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -5430,7 +5430,7 @@ static bool update_wsrep_auto_increment_control (sys_var *self, THD *thd, enum_v
{
/*
The variables that control auto increment shall be calculated
- automaticaly based on the size of the cluster. This usually done
+ automatically based on the size of the cluster. This usually done
within the wsrep_view_handler_cb callback. However, if the user
manually sets the value of wsrep_auto_increment_control to 'ON',
then we should to re-calculate these variables again (because
diff --git a/storage/perfschema/pfs_timer.cc b/storage/perfschema/pfs_timer.cc
index 8533dffcb27..ea39e684110 100644
--- a/storage/perfschema/pfs_timer.cc
+++ b/storage/perfschema/pfs_timer.cc
@@ -166,7 +166,7 @@ void init_timers(void)
/*
For STAGE and STATEMENT, a timer with a fixed frequency is better.
- The prefered timer is nanosecond, or lower resolutions.
+ The preferred timer is nanosecond, or lower resolutions.
*/
if (nanosec_to_pico != 0)
@@ -203,7 +203,7 @@ void init_timers(void)
/*
For IDLE, a timer with a fixed frequency is critical,
as the CPU clock may slow down a lot if the server is completely idle.
- The prefered timer is microsecond, or lower resolutions.
+ The preferred timer is microsecond, or lower resolutions.
*/
if (microsec_to_pico != 0)