summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 11:45:57 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-13 11:45:57 +0200
commit6ffe9ad0d4244a86476fab1485145c0c91871579 (patch)
tree31436f8f5417c8cbefeb786247c269ca130394c2 /sql/sys_vars.cc
parentcae5a0328bd70fa1bc877fc35fecc704fdb6f6cb (diff)
parent5d5735c181f1300c7b208f865806268b16eec5c6 (diff)
downloadmariadb-git-6ffe9ad0d4244a86476fab1485145c0c91871579.tar.gz
Merge 10.9 into 10.10
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 9137d15144e..695c215a854 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -5936,7 +5936,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