summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-23 13:47:15 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-23 13:47:15 +0300
commit13eae1885e739a234cebd592f891e87f387784c6 (patch)
tree0bd1d9dacec4bd9442bb1667648ef416fcc5fb9e /Docs
parenta69cf6f07ee7286d4813ef5c602d5b79b39d3028 (diff)
parentce23802c0e4c85018f2141d2ebb0602dc0d3d6d8 (diff)
downloadmariadb-git-13eae1885e739a234cebd592f891e87f387784c6.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'Docs')
-rw-r--r--Docs/README-wsrep6
-rw-r--r--Docs/myisam.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/Docs/README-wsrep b/Docs/README-wsrep
index 79278ed8927..2e3bf52219d 100644
--- a/Docs/README-wsrep
+++ b/Docs/README-wsrep
@@ -365,7 +365,7 @@ wsrep_forced_binlog_format=none
special value NONE, meaning that there is no forced binlog format in effect.
This variable was introduced to support STATEMENT format replication during
rolling schema upgrade processing. However, in most cases ROW replication
- is valid for asymmetrict schema replication.
+ is valid for asymmetric schema replication.
State snapshot transfer options.
@@ -416,7 +416,7 @@ wsrep_sst_donor=
6. ONLINE SCHEMA UPGRADE
- Schema upgrades mean any data definition statements (DDL statemnents) run
+ Schema upgrades mean any data definition statements (DDL statements) run
for the database. They change the database structure and are non-
transactional.
@@ -429,7 +429,7 @@ wsrep_sst_donor=
With earlier releases, DDL processing happened always by Total Order
Isolation (TOI) method. With TOI, the DDL was scheduled to be processed in
- same transaction seqeuncing 'slot' in each cluster node.
+ same transaction sequencing 'slot' in each cluster node.
The processing is secured by locking the affected table from any other use.
With TOI method, the whole cluster has part of the database locked for the
duration of the DDL processing.
diff --git a/Docs/myisam.txt b/Docs/myisam.txt
index db41fb911ca..f959d8eb775 100644
--- a/Docs/myisam.txt
+++ b/Docs/myisam.txt
@@ -177,7 +177,7 @@ HA_EXTRA_NO_KEYREAD=8 Normal read of records (def)
HA_EXTRA_NO_USER_CHANGE=9 No user is allowed to write
HA_EXTRA_KEY_CACHE=10
HA_EXTRA_NO_KEY_CACHE=11
-HA_EXTRA_WAIT_LOCK=12 Wait until file is avalably (def)
+HA_EXTRA_WAIT_LOCK=12 Wait until file is available (def)
HA_EXTRA_NO_WAIT_LOCK=13 If file is locked, return quickly
HA_EXTRA_WRITE_CACHE=14 Use write cache in ha_write()
HA_EXTRA_FLUSH_CACHE=15 flush write_record_cache