summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-10 13:57:24 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-10 13:57:24 +0200
commit10ed52767d25f3f9b9f5eee4983a3dee612ed2c6 (patch)
tree78341150550fed74c6445f496903faaee73410f6 /BUILD
parentd59674be83b83578f31c2b9434f45a8d62ad4e48 (diff)
parent6ffbc0e510cdaafe0494acd04e48d1f44727e86a (diff)
downloadmariadb-git-10ed52767d25f3f9b9f5eee4983a3dee612ed2c6.tar.gz
Merge branch '10.8' into 10.9mariadb-10.9.2
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/SETUP.sh2
-rwxr-xr-xBUILD/compile-irix-mips64-mipspro2
2 files changed, 2 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index cd6aa38447b..d990608f14e 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -125,7 +125,7 @@ get_make_parallel_flag
# SSL library to use.--with-ssl will select our bundled yaSSL
# implementation of SSL. --with-ssl=yes will first try system library
-# then the boundled one --with-ssl=system will use the system library.
+# then the bundled one --with-ssl=system will use the system library.
# We use bundled by default as this is guaranteed to work with Galera
SSL_LIBRARY=--with-ssl
diff --git a/BUILD/compile-irix-mips64-mipspro b/BUILD/compile-irix-mips64-mipspro
index 917f3d07bbb..94d19358aca 100755
--- a/BUILD/compile-irix-mips64-mipspro
+++ b/BUILD/compile-irix-mips64-mipspro
@@ -55,7 +55,7 @@ path=`dirname $0`
. "$path/autorun.sh"
# C options:
-# -apo - auto-parallize for multiprocessors (implies -mp)
+# -apo - auto-parallelize for multiprocessors (implies -mp)
# -mp - generate multiprocessor code
# These two common optimization options apparently use 'sproc' model of
# threading, which is not compatible with PTHREADS: don't add them unless you