diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:06:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 13:06:08 +0200 |
| commit | c442e1ae21edc1f63906ac6101f1e989b589846f (patch) | |
| tree | c98e223d5236f0e189104121fa96c591b05f1bd6 /BUILD | |
| parent | 4f54c219e7c73072d7eff1e81e0f51dc1ff47509 (diff) | |
| parent | 1ac0bce36e5bf2136cedb1ce1da949f53cce4404 (diff) | |
| download | mariadb-git-c442e1ae21edc1f63906ac6101f1e989b589846f.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 | ||||
| -rwxr-xr-x | BUILD/compile-irix-mips64-mipspro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index e77d86d2462..0ddf02813e3 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 |