From 2cd9f74a5ea41664b7949467d4076826e583c6a0 Mon Sep 17 00:00:00 2001 From: Vasilii Lakhin Date: Mon, 21 Apr 2025 18:27:56 +0300 Subject: [PATCH] Fix remaining typos --- .github/pull_request_template.md | 2 +- .gitlab-ci.yml | 4 ++-- BUILD-CMAKE | 2 +- BUILD/compile-pentium64-ubsan | 2 +- CODING_STANDARDS.md | 2 +- Docs/myisam.txt | 2 +- Docs/optimizer_costs.txt | 8 +++---- cmake/aws_sdk.cmake | 2 +- cmake/generate_sbom.cmake | 2 +- cmake/merge_archives_unix.cmake | 2 +- cmake/os/Windows.cmake | 2 +- debian/autobake-deb.sh | 2 +- .../mariadb-plugin-mroonga.lintian-overrides | 2 +- debian/mariadb-server.postinst | 4 ++-- debian/mariadb-test-data.lintian-overrides | 2 +- debian/source/lintian-overrides | 2 +- extra/mariabackup/innobackupex.cc | 2 +- extra/replace.c | 2 +- .../examples/builder-sample/emb_sample.bpr | 2 +- man/mariadb-check.1 | 4 ++-- man/mariadb-import.1 | 2 +- man/mariadb.1 | 2 +- mysql-test/main/sp.result | 12 +++++----- mysql-test/main/sp.test | 6 ++--- .../suite/perfschema/r/table_schema.result | 2 +- mysys/ChangeLog | 18 +++++++-------- mysys/my_access.c | 2 +- mysys/psi_noop.c | 2 +- plugin/auth_pam/auth_pam_base.c | 2 +- .../hashicorp_key_management.cnf | 4 ++-- .../hashicorp_key_management.txt | 4 ++-- scripts/fill_help_tables.sql | 2 +- scripts/mariadb_system_tables_fix.sql | 2 +- scripts/mysqlaccess.sh | 10 ++++----- scripts/mytop.sh | 10 ++++----- scripts/sys_schema/README.md | 2 +- scripts/sys_schema/views/p_s/metrics_56.sql | 2 +- scripts/wsrep_sst_mariabackup.sh | 2 +- scripts/wsrep_sst_mysqldump.sh | 2 +- sql-bench/Comments/Empress.crash-me | 2 +- sql-bench/Comments/interbase | 4 ++-- sql-bench/Comments/postgres.benchmark | 4 ++-- sql-bench/Comments/postgres.crash-me | 8 +++---- sql-bench/README | 2 +- sql-bench/copy-db.sh | 2 +- sql-bench/crash-me.sh | 14 ++++++------ sql-bench/graph-compare-results.sh | 4 ++-- sql-bench/server-cfg.sh | 4 ++-- sql/field.h | 6 ++--- sql/handler.cc | 4 ++-- sql/handler.h | 2 +- sql/item.cc | 4 ++-- sql/item.h | 6 ++--- sql/item_func.h | 2 +- sql/item_sum.cc | 2 +- sql/item_sum.h | 2 +- sql/log_event_client.cc | 2 +- sql/log_event_server.cc | 2 +- sql/mdl.h | 2 +- sql/my_json_writer.h | 2 +- sql/mysqld.cc | 2 +- sql/mysqld.h | 2 +- sql/opt_histogram_json.cc | 2 +- sql/opt_trace.cc | 2 +- sql/protocol.cc | 2 +- sql/rpl_gtid.cc | 4 ++-- sql/share/README.md | 2 +- sql/share/charsets/Index.xml | 2 +- sql/share/errmsg-utf8.txt | 2 +- sql/slave.cc | 2 +- sql/sql_acl.cc | 2 +- sql/sql_base.cc | 8 +++---- sql/sql_class.cc | 4 ++-- sql/sql_class.h | 4 ++-- sql/sql_const.h | 4 ++-- sql/sql_lex.cc | 2 +- sql/sql_lex.h | 4 ++-- sql/sql_lifo_buffer.h | 2 +- sql/sql_parse.cc | 6 ++--- sql/sql_rename.cc | 2 +- sql/sql_select.cc | 2 +- sql/sql_select.h | 4 ++-- sql/sql_table.cc | 2 +- sql/sql_truncate.cc | 2 +- sql/sql_type.h | 2 +- sql/sql_yacc.yy | 22 +++++++++---------- sql/sys_vars.cc | 2 +- sql/threadpool_common.cc | 2 +- storage/connect/ha_connect.cc | 2 +- storage/connect/plgdbsem.h | 2 +- storage/connect/xindex.cpp | 2 +- storage/csv/ha_tina.cc | 2 +- storage/federated/ha_federated.cc | 2 +- storage/innobase/include/dict0mem.h | 2 +- storage/innobase/include/lock0prdt.h | 2 +- storage/innobase/include/trx0purge.h | 2 +- storage/innobase/include/univ.i | 2 +- storage/maria/aria_chk.c | 2 +- storage/maria/aria_dump_log.c | 2 +- storage/maria/aria_pack.c | 4 ++-- storage/maria/ma_check.c | 2 +- storage/maria/ma_delete.c | 2 +- storage/maria/ma_ft_test1.h | 2 +- storage/maria/ma_loghandler.c | 2 +- storage/maria/ma_statrec.c | 2 +- storage/maria/ma_write.c | 4 ++-- storage/maria/test_aria_s3_copy.sh | 2 +- storage/mroonga/ha_mroonga.cpp | 2 +- storage/mroonga/vendor/groonga/configure.ac | 4 ++-- .../vendor/groonga/lib/grn_ecmascript.c | 2 +- storage/mroonga/vendor/groonga/lib/snip.c | 2 +- .../groonga-normalizer-mysql/README.md | 2 +- storage/myisam/ChangeLog | 4 ++-- storage/myisam/mi_check.c | 2 +- storage/myisam/mi_statrec.c | 2 +- storage/myisam/myisamchk.c | 2 +- storage/myisam/myisampack.c | 4 ++-- storage/perfschema/pfs_column_types.h | 2 +- ...le_replication_connection_configuration.cc | 2 +- storage/rocksdb/ha_rocksdb.cc | 2 +- storage/rocksdb/myrocks_hotbackup.py | 2 +- strings/ctype-simple.c | 2 +- strings/ctype-ucs2.c | 6 ++--- strings/string.doc | 6 ++--- support-files/compiler_warnings.supp | 2 +- support-files/mariadb@.service.in | 2 +- support-files/policy/selinux/README | 2 +- support-files/wsrep.cnf.sh | 2 +- support-files/wsrep_notify.sh | 2 +- tests/check_costs.pl | 4 ++-- tests/upgrade_from/test_upgrade.sh | 2 +- vio/docs/COPYING.openssl | 2 +- win/create_def_file.js | 4 ++-- win/packaging/CPackWixConfig.cmake | 2 +- win/packaging/extra.wxs.in | 2 +- 135 files changed, 217 insertions(+), 217 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index bef89548fb933..7a34e193b3548 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -43,7 +43,7 @@ Tick one of the following boxes [x] to help us understand if the base branch for - [ ] *This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.* ## PR quality check diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e56da2eafa706..c0e0fd349626c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ --- # This Gitlab-CI pipeline offers basic validation that a commit did not -# introduce easily detectable regressions. Builds run primairly on a new Fedora, +# introduce easily detectable regressions. Builds run primarily on a new Fedora, # which has all the latest upstream build dependencies and thus is the primary # testing target, as eventually everything in Fedora becomes the next CentOS and # Red Hat releases. @@ -315,7 +315,7 @@ mysql-test-run: # # Additionally, for each sanitizer MTR job, we enable --force-restart so that # sanitizer errors can be traced to individual tests. The difference in test -# suite runtime as a result of this flag is negligable (~30s for the entire test suite). +# suite runtime as a result of this flag is negligible (~30s for the entire test suite). # (see https://dev.mysql.com/doc/dev/mysql-server/latest/PAGE_MYSQL_TEST_RUN_PL.html) mysql-test-run-asan: stage: test diff --git a/BUILD-CMAKE b/BUILD-CMAKE index aedce4400c6e8..c29d79b7f4ad5 100644 --- a/BUILD-CMAKE +++ b/BUILD-CMAKE @@ -242,7 +242,7 @@ is in /sql/CMakeFiles/mysqld.dir/link.txt feature because tests do not rerun when reconfiguring (e.g when a new test was added).The downside of caching is that when a platform test was wrong and was later corrected, the cached result is still used. If you encounter this -situation, which should be a rare occation, you need either to remove the +situation, which should be a rare occasion, you need either to remove the offending entry from CMakeCache.txt (if test was for HAVE_FOO, remove lines containing HAVE_FOO from CMakeCache.txt) or just remove the cache file. diff --git a/BUILD/compile-pentium64-ubsan b/BUILD/compile-pentium64-ubsan index 538b5e884cf4c..c5459a1b2fc43 100755 --- a/BUILD/compile-pentium64-ubsan +++ b/BUILD/compile-pentium64-ubsan @@ -15,7 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA # Compilation with UBSAN, The Undefined Behavior Sanitizer -# We have to use -Wno-uninitialized and -Wno-unitialized we get a lot of false +# We have to use -Wno-uninitialized and we get a lot of false # positive warnings for this when compiling with -fsanitize=undefined. # We also have to compile without Spider as linking with Spider library does # not work. (errno: 11, undefined symbol: _ZTI12ha_partition) diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md index f67d4d6bdf906..d115a8d0a907e 100644 --- a/CODING_STANDARDS.md +++ b/CODING_STANDARDS.md @@ -25,7 +25,7 @@ MDEV-12345 Fixing Rockwell Turbo Encabulator The new principle involved is that instead of power being generated by the relative motion of conductors and fluxes, it’s produced by the -modial interaction of magneto-reluctance and capacitive diractance. +modial interaction of magneto-reluctance and capacitive directance. ``` The only explicitly allowed exception to the 50-72 rules is that if the first line can be MDEV-###### title', even if the title would make the line longer than 50 characters. diff --git a/Docs/myisam.txt b/Docs/myisam.txt index f959d8eb775e2..cbf46bded0dcc 100644 --- a/Docs/myisam.txt +++ b/Docs/myisam.txt @@ -168,7 +168,7 @@ The function parameter can be: HA_EXTRA_NORMAL=0 Optimize for space (def) HA_EXTRA_QUICK=1 Optimize for speed HA_EXTRA_RESET=2 Reset database to after open -HA_EXTRA_CACHE=3 Cash record in HA_rrnd() +HA_EXTRA_CACHE=3 Cache record in HA_rrnd() HA_EXTRA_NO_CACHE=4 End caching of records (def) HA_EXTRA_NO_READCHECK=5 No readcheck on update HA_EXTRA_READCHECK=6 Use readcheck (def) diff --git a/Docs/optimizer_costs.txt b/Docs/optimizer_costs.txt index 8518728a43e8b..b05b85c05da09 100644 --- a/Docs/optimizer_costs.txt +++ b/Docs/optimizer_costs.txt @@ -179,7 +179,7 @@ MariaDB [test]> select sum(1) from seq_1_to_100000000; 1 row in set (5.162 sec) Time of where= (8.564-5.162)/100000000 = 3.402/100000000 (100,000,000) -(Result good enough, as sligthly different computations) +(Result is good enough for slightly different computations) check_costs.pl comes provides the numbers when using heap tables and 1M rows: @@ -217,7 +217,7 @@ cost= scan_time() * optimizer_cache_cost * SCAN_LOOKUP_COST + We are ignoring TABLE_SCAN_SETUP (which is just to prefer index lookup on small tables). We can also ignore records * WHERE_COMPARE_COST as we don't have that -in the above calcuated 'ms'. +in the above calculated 'ms'. row_costs= (ROW_COPY_COST + ROW_LOOKUP_COST) cost= scan_time() * 1 * 1 + @@ -430,7 +430,7 @@ blocks= index_size/IO_SIZE = -> 1000000 * 19 / 0.75/ 4096 = 6184 engine_blocks (block_size 8192) = 6184/2 = 3092 -(Range optimzer had calculated 3085) +(Range optimizer had calculated 3085) keyread_time= blocks * avg_io_cost() * cache + engine_blocks * INDEX_BLOCK_COPY_COST + rows * (KEY_NEXT_FIND_COST + KEY_COPY_COST); = engine_blocks * INDEX_BLOCK_COPY_COST + rows * KEY_NEXT_FIND_COST= @@ -1258,7 +1258,7 @@ MySQL cost structures MySQL 8.0 server cost are stored in the class Server_cost_constants defined int opt_costconstants.h -It containts the following slots and has the following default values: +It contains the following slots and has the following default values: m_row_evaluate_cost 0.1 Cost for evaluating the query condition on a row diff --git a/cmake/aws_sdk.cmake b/cmake/aws_sdk.cmake index a0d46e1a89257..e24a141cd1a8c 100644 --- a/cmake/aws_sdk.cmake +++ b/cmake/aws_sdk.cmake @@ -43,7 +43,7 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON) ENDIF() IF(UNIX) - # Check librairies required for building SDK + # Check libraries required for building SDK FIND_PACKAGE(CURL) SET_PACKAGE_PROPERTIES(CURL PROPERTIES TYPE REQUIRED) IF(NOT CURL_FOUND) diff --git a/cmake/generate_sbom.cmake b/cmake/generate_sbom.cmake index e00a5c9b3a2e5..9fcea6f82709f 100644 --- a/cmake/generate_sbom.cmake +++ b/cmake/generate_sbom.cmake @@ -149,7 +149,7 @@ FUNCTION(GENERATE_SBOM) LIST(FILTER ALL_SUBMODULES EXCLUDE REGEX libmariadb/docs) # It is possible to provide EXTRA_SBOM_DEPENDENCIES - # and accompanying per-dependency data, to extend generared sbom + # and accompanying per-dependency data, to extend generated sbom # document. # Example below injects an extra "ncurses" dependency using several # command line parameters for CMake. diff --git a/cmake/merge_archives_unix.cmake b/cmake/merge_archives_unix.cmake index a66daddaefce3..0c5bec8b66a1b 100644 --- a/cmake/merge_archives_unix.cmake +++ b/cmake/merge_archives_unix.cmake @@ -15,7 +15,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA -# MRI scripts have a problem with +. It's a line contination character +# MRI scripts have a problem with +. It's a line continuation character # unfortunately there is no escape character. We know we don't have # "+" in libraries or the MariaDB paths, but Ubuntu CI builds will have # in their CI path due to the package names that Ubuntu generates. diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 510413d915c6d..e2d158e713ed3 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -67,7 +67,7 @@ ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN) # Adjust compiler and linker flags IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4) - # mininal architecture flags, i486 enables GCC atomics + # minimal architecture flags, i486 enables GCC atomics ADD_DEFINITIONS(-march=i486) ENDIF() diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 1a8233bec3f2b..4e0cb0a2125e4 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -59,7 +59,7 @@ disable_libfmt() remove_package_notes() { - # binutils >=2.39 + disto makefile /usr/share/debhelper/dh_package_notes/package-notes.mk + # binutils >=2.39 + distro makefile /usr/share/debhelper/dh_package_notes/package-notes.mk sed -e '/package.notes/d' -i debian/rules debian/control } diff --git a/debian/mariadb-plugin-mroonga.lintian-overrides b/debian/mariadb-plugin-mroonga.lintian-overrides index 48404b2c9462d..e9d496461a4a2 100644 --- a/debian/mariadb-plugin-mroonga.lintian-overrides +++ b/debian/mariadb-plugin-mroonga.lintian-overrides @@ -1,2 +1,2 @@ -# This little bit diffrent than MariaDB so needed file +# This is a little bit different than MariaDB so needed file mariadb-plugin-mroonga: extra-license-file [usr/share/mysql/mroonga/COPYING] diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst index ea8de619b5d74..6e3f1e6387c4f 100644 --- a/debian/mariadb-server.postinst +++ b/debian/mariadb-server.postinst @@ -145,7 +145,7 @@ EOF then mkdir -Z "$mariadb_logdir" fi - # When creating an ext3 jounal on an already mounted filesystem like e.g. + # When creating an ext3 journal on an already mounted filesystem like e.g. # /var/lib/mysql, you get a .journal file that is not modifiable by chown. # The mariadb_statedir must not be writable by the mysql user under any # circumstances as it contains scripts that are executed by root. @@ -172,7 +172,7 @@ EOF # 3. Allow user 'mysql' to see and execute auth_pam_tool # -> Now user mysql owns the directory and can see and execute the binary inside # -> Since the binary is setuid, user mysql gets limited root powers here to - # run the PAM authetications, which need root (e.g. to validate passwords + # run the PAM authentications, which need root (e.g. to validate passwords # against /etc/shadow) chown mysql /usr/lib/mysql/plugin/auth_pam_tool_dir diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides index 1cce591412f4d..e4f23b1882ef4 100644 --- a/debian/mariadb-test-data.lintian-overrides +++ b/debian/mariadb-test-data.lintian-overrides @@ -12,7 +12,7 @@ incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mar bash-term-in-posix-shell '${BASH_VERSION' [usr/share/mysql/mariadb-test/std_data/wsrep_notify.sh:87] bash-term-in-posix-shell '${BASH_VERSION' [usr/share/mysql/mariadb-test/std_data/wsrep_notify_ssl.sh:87] # These files are result files and they are supposed to be -# Natial encoded (ISO/IEC 8859-1) not UTF-8 +# National encoded (ISO/IEC 8859-1) not UTF-8 national-encoding [usr/share/mysql/mariadb-test/include/ctype_E05C.inc] national-encoding [usr/share/mysql/mariadb-test/main/alter_table.result] national-encoding [usr/share/mysql/mariadb-test/main/binary.result] diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 65a2893331f95..7851c99914031 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -6,7 +6,7 @@ mariadb source: package-uses-deprecated-debhelper-compat-version 9 source-is-missing [sql/share/charsets/languages.html] source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html] missing-build-dependency-for-dh-addon systemd (does not satisfy debhelper:any (>= 9.20160709~) | debhelper-compat:any | dh-sequence-systemd:any | dh-systemd:any) [debian/rules] -# Should in some point reviewd what should we done +# Should in some point review what should we do dependency-is-not-multi-archified libmariadb-dev-compat depends on libmariadb-dev (multi-arch: no) dependency-is-not-multi-archified mariadb-plugin-gssapi-client depends on mariadb-client (multi-arch: no) # These are for purpose diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc index 22f4dc387dd67..867afa1a6f47a 100644 --- a/extra/mariabackup/innobackupex.cc +++ b/extra/mariabackup/innobackupex.cc @@ -188,7 +188,7 @@ enum innobackupex_options OPT_DATABASES, OPT_DECOMPRESS, - /* options wich are passed directly to xtrabackup */ + /* options which are passed directly to xtrabackup */ OPT_CLOSE_FILES, OPT_COMPACT, OPT_COMPRESS, diff --git a/extra/replace.c b/extra/replace.c index a28463fd30f25..a882ca4ef0020 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -698,7 +698,7 @@ static int init_sets(REP_SETS *sets,uint states) return 0; } - /* Make help sets invisible for nicer codeing */ + /* Make help sets invisible for nicer coding */ static void make_sets_invisible(REP_SETS *sets) { diff --git a/libmysqld/examples/builder-sample/emb_sample.bpr b/libmysqld/examples/builder-sample/emb_sample.bpr index ab66dce878884..65f8e41143d93 100644 --- a/libmysqld/examples/builder-sample/emb_sample.bpr +++ b/libmysqld/examples/builder-sample/emb_sample.bpr @@ -95,7 +95,7 @@ Comments= [HistoryLists\hlIncludePath] Count=2 Item0=$(BCB)\include;$(BCB)\include\vcl;..\..\..\include -Item1=$(BCB)\include;$(BCB)\include\vcl;..\..\..\inluce +Item1=$(BCB)\include;$(BCB)\include\vcl;..\..\..\include [HistoryLists\hlLibraryPath] Count=1 diff --git a/man/mariadb-check.1 b/man/mariadb-check.1 index 3a401bd407110..e317e68e541c9 100644 --- a/man/mariadb-check.1 +++ b/man/mariadb-check.1 @@ -676,12 +676,12 @@ Specifying a password on the command line should be considered insecure\&. You c .sp -1 .IP \(bu 2.3 .\} -.\" mariadb-check: persisent option +.\" mariadb-check: persistent option .\" persistent option: mariadb-check \fB\-\-persistent\fR, \fB\-Z\fR .sp -Used with ANALYZE TABLE to append the option PERSISENT FOR ALL. +Used with ANALYZE TABLE to append the option PERSISTENT FOR ALL. .RE .sp .RS 4 diff --git a/man/mariadb-import.1 b/man/mariadb-import.1 index 945fda5308ab9..2a5e6a784367d 100644 --- a/man/mariadb-import.1 +++ b/man/mariadb-import.1 @@ -480,7 +480,7 @@ first argument\&. .IP \(bu 2.3 .\} .\" mariadb-import: parallel option -.\" paralle option: mariadb-import +.\" parallel option: mariadb-import \fB\-\-parallel=\fR\fB\fIN\fR\fR, \fB\-j \fR\fB\fIN\fR\fR\fR .sp diff --git a/man/mariadb.1 b/man/mariadb.1 index 2e65f9c50bb1a..fa165db018d05 100644 --- a/man/mariadb.1 +++ b/man/mariadb.1 @@ -1847,7 +1847,7 @@ Change the string that \fBmariadb\fR interprets as the separator between SQL statements\&. The default is the semicolon character (\(lq;\(rq)\&. .sp -The delimiter can be specified as an unquoted or quoted argument\&. Quoting can be done with either single quote (') or douple quote (") characters\&. To include a quote within a quoted string, either quote the string with the other quote character or escape the quote with a backslash (\(lq\e\(rq) character\&. Backslash should be avoided outside of quoted strings because it is the escape character for MariaDB\&. For an unquoted argument, the delmiter is read up to the first space or end of line\&. For a quoted argument, the delimiter is read up to the matching quote on the line\&. +The delimiter can be specified as an unquoted or quoted argument\&. Quoting can be done with either single quote (') or double quote (") characters\&. To include a quote within a quoted string, either quote the string with the other quote character or escape the quote with a backslash (\(lq\e\(rq) character\&. Backslash should be avoided outside of quoted strings because it is the escape character for MariaDB\&. For an unquoted argument, the delimiter is read up to the first space or end of line\&. For a quoted argument, the delimiter is read up to the matching quote on the line\&. .sp When the delimiter recognized by \fBmariadb\fR diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result index 4616baed65a6a..15435d3a236d8 100644 --- a/mysql-test/main/sp.result +++ b/mysql-test/main/sp.result @@ -4232,7 +4232,7 @@ create procedure bug15231_2(inout ioid integer) begin select "Before NOT FOUND condition is triggered" as '1'; select id into ioid from t3 where id=ioid; -select "After NOT FOUND condtition is triggered" as '2'; +select "After NOT FOUND condition is triggered" as '2'; if ioid is null then set ioid=1; end if; @@ -4267,7 +4267,7 @@ call bug15231_1()| 1 Before NOT FOUND condition is triggered 2 -After NOT FOUND condtition is triggered +After NOT FOUND condition is triggered xid xdone 1 1 call bug15231_3()| @@ -5305,12 +5305,12 @@ PRIMARY KEY ( id ) CREATE TABLE bug23760_log ( id INT NOT NULL AUTO_INCREMENT , reason VARCHAR(50)NULL , -ammount INT NOT NULL , +amount INT NOT NULL , PRIMARY KEY ( id ) )| CREATE PROCEDURE bug23760_update_log(r Varchar(50), a INT) BEGIN -INSERT INTO bug23760_log (reason, ammount) VALUES(r, a); +INSERT INTO bug23760_log (reason, amount) VALUES(r, a); END| CREATE PROCEDURE bug23760_test_row_count() BEGIN @@ -5333,7 +5333,7 @@ ROW_COUNT() 7 CALL bug23760_test_row_count()| SELECT * FROM bug23760_log ORDER BY id| -id reason ammount +id reason amount 1 Test is working 7 SET @save_max_sp_recursion= @@max_sp_recursion_depth| SELECT @save_max_sp_recursion| @@ -5348,7 +5348,7 @@ SELECT ROW_COUNT()| ROW_COUNT() 16 SELECT * FROM bug23760_log ORDER BY id| -id reason ammount +id reason amount 1 Test is working 7 2 Test2 is working 7 3 Test2 is working 7 diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test index 98187930040e4..ed5488b3894b0 100644 --- a/mysql-test/main/sp.test +++ b/mysql-test/main/sp.test @@ -4674,7 +4674,7 @@ create procedure bug15231_2(inout ioid integer) begin select "Before NOT FOUND condition is triggered" as '1'; select id into ioid from t3 where id=ioid; - select "After NOT FOUND condtition is triggered" as '2'; + select "After NOT FOUND condition is triggered" as '2'; if ioid is null then set ioid=1; @@ -5840,13 +5840,13 @@ CREATE TABLE bug23760 ( CREATE TABLE bug23760_log ( id INT NOT NULL AUTO_INCREMENT , reason VARCHAR(50)NULL , - ammount INT NOT NULL , + amount INT NOT NULL , PRIMARY KEY ( id ) )| CREATE PROCEDURE bug23760_update_log(r Varchar(50), a INT) BEGIN - INSERT INTO bug23760_log (reason, ammount) VALUES(r, a); + INSERT INTO bug23760_log (reason, amount) VALUES(r, a); END| CREATE PROCEDURE bug23760_test_row_count() diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result index 31f7f2669f576..2d4754d2589b0 100644 --- a/mysql-test/suite/perfschema/r/table_schema.result +++ b/mysql-test/suite/perfschema/r/table_schema.result @@ -885,7 +885,7 @@ def performance_schema replication_connection_configuration SSL_ALLOWED 6 NULL N def performance_schema replication_connection_configuration SSL_CA_FILE 7 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select,insert,update,references Path to the file that contains one or more certificates for trusted Certificate Authorities (CA) to use for TLS. NEVER NULL NO NO def performance_schema replication_connection_configuration SSL_CA_PATH 8 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select,insert,update,references Path to a directory that contains one or more PEM files that contain X509 certificates for a trusted Certificate Authority (CA) to use for TLS. NEVER NULL NO NO def performance_schema replication_connection_configuration SSL_CERTIFICATE 9 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select,insert,update,references Path to the certificate used to authenticate the master. NEVER NULL NO NO -def performance_schema replication_connection_configuration SSL_CIPHER 10 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select,insert,update,references Which cipher is used for encription. NEVER NULL NO NO +def performance_schema replication_connection_configuration SSL_CIPHER 10 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select,insert,update,references Which cipher is used for encryption. NEVER NULL NO NO def performance_schema replication_connection_configuration SSL_KEY 11 NULL NO varchar 512 1536 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(512) select,insert,update,references Path to the private key used for TLS. NEVER NULL NO NO def performance_schema replication_connection_configuration SSL_VERIFY_SERVER_CERTIFICATE 12 NULL NO enum 3 9 NULL NULL NULL utf8mb3 utf8mb3_general_ci enum('YES','NO') select,insert,update,references Whether the server certificate is verified as part of the SSL connection NEVER NULL NO NO def performance_schema replication_connection_configuration SSL_CRL_FILE 13 NULL NO varchar 255 765 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(255) select,insert,update,references Path to the PEM file containing one or more revoked X.509 certificates. NEVER NULL NO NO diff --git a/mysys/ChangeLog b/mysys/ChangeLog index 7a42610666776..90e4c94d5d57e 100644 --- a/mysys/ChangeLog +++ b/mysys/ChangeLog @@ -37,7 +37,7 @@ Mon Aug 31 23:51:13 1992 Michael Widenius (monty@bitch) Mon Aug 17 01:46:36 1992 Michael Widenius (monty@bitch) - * Added ny cashing-rutine mf_iocash for quicker io. + * Added ny caching-routine mf_iocache for quicker io. Wed Aug 12 13:41:18 1992 Michael Widenius (monty@bitch) @@ -108,8 +108,8 @@ Fri Nov 23 23:53:46 1990 Michael Widenius (monty at LYNX) Mon Oct 1 13:16:15 1990 Michael Widenius (monty at LYNX) - * Added use of asynchronic io in read_cash_record(). - * Added write_cash and flush_write_cash to record cashing. + * Added use of asynchronic io in read_cache_record(). + * Added write_cache and flush_write_cache to record caching. Sun Sep 16 22:05:25 1990 Michael Widenius (monty at LYNX) @@ -125,7 +125,7 @@ Sun Apr 1 23:29:47 1990 Monty (monty at monty) * Changed mf_keydisk.c to have separate functions for read and write. Read can now return pointer to intern key-buffer to skip - unessessary memcpy-s. + unnecessary memcpy-s. Fri Mar 23 23:03:39 1990 Monty (monty at monty) @@ -152,7 +152,7 @@ Mon Dec 4 17:36:16 1989 Monty (monty at monty) * Changed safemalloc() to use my_message() if out of memory and to check MY_WME if we want this error-messages. - * Changed my_setwd() to use dos_setdrive() insted of system(). + * Changed my_setwd() to use dos_setdrive() instead of system(). Wed Oct 25 02:56:07 1989 Monty (monty at monty) @@ -179,7 +179,7 @@ Wed Jun 21 01:34:04 1989 Monty (monty at monty) Mon May 22 14:03:44 1989 Monty (monty at monty) * Fixed my_getwd and my_setwd so they work. - * Added extern variabel curr_char[] with is set to current + * Added extern variable curr_char[] with is set to current directory after my_getwd() or my_setwd(); Mon Jan 23 03:38:50 1989 Monty (monty at monty) @@ -208,14 +208,14 @@ Fri Dec 2 03:29:21 1988 Monty (monty at monty) * Added more defines under MEMORY in my_func.h * Added functions to llib-lmysys. - * Removed RCS/* files and installed ewerything as stable. + * Removed RCS/* files and installed everything as stable. (Because errors in old RCS-files. Wed Nov 9 00:32:33 1988 Monty (monty at monty) * Changed realloc for MSDOS; Previous version freed old block on - * error, new version (of compiler) dosn't. + * error, new version (of compiler) doesn't. Wed Oct 26 21:07:27 1988 Monty (monty at monty) - * Fixed missing updateing of my_stream_opened; + * Fixed missing updating of my_stream_opened; diff --git a/mysys/my_access.c b/mysys/my_access.c index bd722da1e5977..d6f8e955702e3 100644 --- a/mysys/my_access.c +++ b/mysys/my_access.c @@ -20,7 +20,7 @@ #ifdef _WIN32 /* - Check a file or path for accessability. + Check a file or path for accesibility. SYNOPSIS file_access() diff --git a/mysys/psi_noop.c b/mysys/psi_noop.c index cc40e609f63ab..9f78bb3397ebe 100644 --- a/mysys/psi_noop.c +++ b/mysys/psi_noop.c @@ -461,7 +461,7 @@ static void end_file_open_wait_and_bind_to_descriptor_noop } static void end_temp_file_open_wait_and_bind_to_descriptor_noop - (PSI_file_locker *locker NNN, File file NNN, const char *filaneme NNN) + (PSI_file_locker *locker NNN, File file NNN, const char *filename NNN) { return; } diff --git a/plugin/auth_pam/auth_pam_base.c b/plugin/auth_pam/auth_pam_base.c index 153712df140d1..a27c7033d3292 100644 --- a/plugin/auth_pam/auth_pam_base.c +++ b/plugin/auth_pam/auth_pam_base.c @@ -18,7 +18,7 @@ This file contains code to interact with the PAM module. To be included into auth_pam_tool.c and auth_pam_v2.c, - Before the #include these sould be defined: + Before the #include these should be defined: struct param { unsigned char buf[10240], *ptr; diff --git a/plugin/hashicorp_key_management/hashicorp_key_management.cnf b/plugin/hashicorp_key_management/hashicorp_key_management.cnf index 275626a9e7b57..92e84094a30b8 100644 --- a/plugin/hashicorp_key_management/hashicorp_key_management.cnf +++ b/plugin/hashicorp_key_management/hashicorp_key_management.cnf @@ -96,8 +96,8 @@ # becomes invalid and an attempt to read this information causes # a new request send to the vault server. # -# If the value of this parameter is zero, then information abount -# latest key version numbers always considered invalid, unless +# If the value of this parameter is zero, then information about +# latest key version numbers is always considered invalid, unless # there is no communication with the vault server and use of the # cache is allowed when the server is unavailable. # diff --git a/plugin/hashicorp_key_management/hashicorp_key_management.txt b/plugin/hashicorp_key_management/hashicorp_key_management.txt index 1750154858e10..674c455dfd7a7 100644 --- a/plugin/hashicorp_key_management/hashicorp_key_management.txt +++ b/plugin/hashicorp_key_management/hashicorp_key_management.txt @@ -163,8 +163,8 @@ operation: becomes invalid and an attempt to read this information causes a new request send to the vault server. - If the value of this parameter is zero, then information abount - latest key version numbers always considered invalid, unless + If the value of this parameter is zero, then information about + latest key version numbers is always considered invalid, unless there is no communication with the vault server and use of the cache is allowed when the server is unavailable. diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql index e5bcd336ea09c..6198ff9aea7ec 100644 --- a/scripts/fill_help_tables.sql +++ b/scripts/fill_help_tables.sql @@ -456,7 +456,7 @@ insert into help_topic (help_topic_id,help_category_id,name,description,example, insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (361,26,'About SHOW','SHOW has many forms that provide information about databases, tables, columns,\nor status information about the server. These include:\n\n* SHOW AUTHORS\n* SHOW CHARACTER SET [like_or_where]\n* SHOW COLLATION [like_or_where]\n* SHOW [FULL] COLUMNS FROM tbl_name [FROM db_name] [like_or_where]\n* SHOW CONTRIBUTORS\n* SHOW CREATE DATABASE db_name\n* SHOW CREATE EVENT event_name\n* SHOW CREATE PACKAGE package_name\n* SHOW CREATE PACKAGE BODY package_name\n* SHOW CREATE PROCEDURE proc_name\n* SHOW CREATE TABLE tbl_name\n* SHOW CREATE TRIGGER trigger_name\n* SHOW CREATE VIEW view_name\n* SHOW DATABASES [like_or_where]\n* SHOW ENGINE engine_name {STATUS | MUTEX}\n* SHOW [STORAGE] ENGINES\n* SHOW ERRORS [LIMIT [offset,] row_count]\n* SHOW [FULL] EVENTS\n* SHOW FUNCTION CODE func_name\n* SHOW FUNCTION STATUS [like_or_where]\n* SHOW GRANTS FOR user\n* SHOW INDEX FROM tbl_name [FROM db_name]\n* SHOW INNODB STATUS\n* SHOW OPEN TABLES [FROM db_name] [like_or_where]\n* SHOW PLUGINS\n* SHOW PROCEDURE CODE proc_name\n* SHOW PROCEDURE STATUS [like_or_where]\n* SHOW PRIVILEGES\n* SHOW [FULL] PROCESSLIST\n* SHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]\n* SHOW PROFILES\n* SHOW [GLOBAL | SESSION] STATUS [like_or_where]\n* SHOW TABLE STATUS [FROM db_name] [like_or_where]\n* SHOW TABLES [FROM db_name] [like_or_where]\n* SHOW TRIGGERS [FROM db_name] [like_or_where]\n* SHOW [GLOBAL | SESSION] VARIABLES [like_or_where]\n* SHOW WARNINGS [LIMIT [offset,] row_count]\n\nlike_or_where:\n LIKE \'pattern\'\n | WHERE expr\n\nIf the syntax for a given SHOW statement includes a LIKE \'pattern\' part,\n\'pattern\' is a string that can contain the SQL \"%\" and \"_\" wildcard\ncharacters. The pattern is useful for restricting statement output to matching\nvalues.\n\nSeveral SHOW statements also accept a WHERE clause that provides more\nflexibility in specifying which rows to display. See Extended Show.\n\nURL: https://mariadb.com/kb/en/about-show/','','https://mariadb.com/kb/en/about-show/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (362,26,'Extended Show','The following SHOW statements can be extended by using a WHERE clause and a\nLIKE clause to refine the results:\n\n* SHOW CHARACTER SET\n* SHOW COLLATION\n* SHOW COLUMNS\n* SHOW DATABASES\n* SHOW FUNCTION STATUS\n* SHOW INDEX\n* SHOW OPEN TABLES\n* SHOW PACKAGE STATUS\n* SHOW PACKAGE BODY STATUS\n* SHOW INDEX\n* SHOW PROCEDURE STATUS\n* SHOW STATUS\n* SHOW TABLE STATUS\n* SHOW TABLES\n* SHOW TRIGGERS\n* SHOW VARIABLES\n\nAs with a regular SELECT, the WHERE clause can be used for the specific\ncolumns returned, and the LIKE clause with the regular wildcards.\n\nExamples\n--------\n\nSHOW TABLES;\n+----------------------+\n| Tables_in_test |\n+----------------------+\n| animal_count |\n| animals |\n| are_the_mooses_loose |\n| aria_test2 |\n| t1 |\n| view1 |\n+----------------------+\n\nShowing the tables beginning with a only.\n\nSHOW TABLES WHERE Tables_in_test LIKE \'a%\';\n+----------------------+\n| Tables_in_test |\n+----------------------+\n| animal_count |\n| animals |\n| are_the_mooses_loose |\n| aria_test2 |\n+----------------------+\n\nVariables whose name starts with aria and with a valued of greater than 8192:\n\nSHOW VARIABLES WHERE Variable_name LIKE \'aria%\' AND Value >8192;\n+------------------------------+---------------------+\n| Variable_name | Value |\n+------------------------------+---------------------+\n| aria_checkpoint_log_activity | 1048576 |\n| aria_log_file_size | 1073741824 |\n| aria_max_sort_file_size | 9223372036853727232 |\n| aria_pagecache_buffer_size | 134217728 |\n| aria_sort_buffer_size | 134217728 |\n+------------------------------+---------------------+\n\nShortcut, just returning variables whose name begins with aria.\n\nSHOW VARIABLES LIKE \'aria%\';\n+------------------------------------------+---------------------+\n| Variable_name | Value |\n+------------------------------------------+---------------------+\n| aria_block_size | 8192 |\n| aria_checkpoint_interval | 30 |\n| aria_checkpoint_log_activity | 1048576 |\n| aria_force_start_after_recovery_failures | 0 |\n| aria_group_commit | none |\n| aria_group_commit_interval | 0 |\n| aria_log_file_size | 1073741824 |\n| aria_log_purge_type | immediate |\n| aria_max_sort_file_size | 9223372036853727232 |\n| aria_page_checksum | ON |\n| aria_pagecache_age_threshold | 300 |\n| aria_pagecache_buffer_size | 134217728 |\n| aria_pagecache_division_limit | 100 |\n| aria_recover | NORMAL |\n| aria_repair_threads | 1 |\n| aria_sort_buffer_size | 134217728 |\n| aria_stats_method | nulls_unequal |\n| aria_sync_log_dir | NEWFILE |\n| aria_used_for_temp_tables | ON |\n+------------------------------------------+---------------------+\n\nURL: https://mariadb.com/kb/en/extended-show/','','https://mariadb.com/kb/en/extended-show/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (363,26,'SHOW ANALYZE','MariaDB starting with 10.9\n--------------------------\nSHOW ANALYZE was added in MariaDB 10.9.\n\nSyntax\n------\n\nSHOW ANALYZE [FORMAT=JSON] FOR ;\n\nDescription\n-----------\n\nSHOW ANALYZE allows one to retrieve ANALYZE-like output from a currently\nrunning statement. The command\n\nSHOW ANALYZE [FORMAT=JSON] FOR ;\n\nconnects to the query running in connection connection_id, gets information\nabout the query plan it is executing, also gets information about the runtime\nstatistics of the execution so far and returns it in a format similar to\nANALYZE [FORMAT=JSON] output.\n\nThis is similar to the SHOW EXPLAIN command, the difference being that SHOW\nANALYZE also produces runtime statistics information.\n\nIntended Usage\n--------------\n\nImagine you\'re trying to troubleshoot a query that never finishes. Since it\ndoesn\'t finish, it is not possible to get ANALYZE output for it. With SHOW\nANALYZE, you can get the runtime statistics without waiting for the query to\nfinish.\n\nExamples\n--------\n\nExample 1: Row Counts\n---------------------\n\nConsider the tables orders and customer and a join query finding the total\namount of orders from customers with Gold status:\n\nexplain format=json\nselect sum(orders.amount)\nfrom\n customer join orders on customer.cust_id=orders.cust_id\nwhere\n customer.status=\'GOLD\';\n\nThe EXPLAIN for this query looks like this:\n\n+------+-------------+----------+------+---------------+---------+---------+---\n--------------+--------+-------------+\n| id | select_type | table | type | possible_keys | key | key_len |\nref | rows | Extra |\n+------+-------------+----------+------+---------------+---------+---------+---\n--------------+--------+-------------+\n| 1 | SIMPLE | customer | ALL | PRIMARY | NULL | NULL |\nNULL | 199786 | Using where |\n| 1 | SIMPLE | orders | ref | cust_id | cust_id | 5 |\ncustomer.cust_id | 1 | |\n+------+-------------+----------+------+---------------+---------+---------+---\n--------------+--------+-------------+\n\nWe run the SELECT, and it has been running for 30 seconds. Let\'s try SHOW\nANALYZE:\n\nshow analyze format=json for 3;\n| {\n \"r_query_time_in_progress_ms\": 32138,\n\n^ this shows how long the query has been running.\n\n\"query_block\": {\n \"select_id\": 1,\n \"r_loops\": 1,\n \"nested_loop\": [\n {\n \"table\": {\n \"table_name\": \"customer\",\n \"access_type\": \"ALL\",\n \"possible_keys\": [\"PRIMARY\"],\n \"r_loops\": 1,\n \"rows\": 199786,\n \"r_rows\": 110544,\n\n^ rows shows the number of rows expected. r_rows in this example shows how\nmany rows were processed so far (110K out of expected 200K). r_loops above\nshows we\'re doing the first table scan (which is obvious for this query plan).\n\n\"filtered\": 100,\n \"r_filtered\": 9.538283398,\n \"attached_condition\": \"customer.`status` = \'GOLD\'\"\n }\n },\n {\n \"table\": {\n \"table_name\": \"orders\",\n \"access_type\": \"ref\",\n \"possible_keys\": [\"cust_id\"],\n \"key\": \"cust_id\",\n \"key_length\": \"5\",\n \"used_key_parts\": [\"cust_id\"],\n \"ref\": [\"test.customer.cust_id\"],\n \"r_loops\": 10544,\n \"rows\": 1,\n \"r_rows\": 99.99222307,\n\n^ here, rows: 1 shows the optimizer was expecting 1 order per customer. But\nr_rows: 99.9 shows that execution has found on average 100 orders per\ncustomer. This may be the reason the query is slower than expected!\n\nThe final chunk of the output doesn\'t have anything interesting but here it is:\n\n\"filtered\": 100,\n \"r_filtered\": 100\n }\n }\n ]\n }\n}\n\nExample 2: Timing Information\n-----------------------------\n\nRegular SELECT queries collect row count information, so SHOW ANALYZE can\ndisplay it. However, detailed timing information is not collected, as\ncollecting it may have CPU overhead. But if the target query is collecting\ntiming information, SHOW ANALYZE will display it. How does one get the target\nquery to collect timing information? Currently there is one way: if the target\nis running ANALYZE, it IS collecting timing information. Re-running the\nprevious example:\n\nConnection 1> ANALYZE SELECT ... ;\n\nConnection 2> SHOW ANALYZE FORMAT=JSON FOR ;\nANALYZE\n{\n \"r_query_time_in_progress_ms\": 30727,\n \"query_block\": {\n \"select_id\": 1,\n \"r_loops\": 1,\n \"nested_loop\": [\n {\n \"table\": {\n \"table_name\": \"customer\",\n \"access_type\": \"ALL\",\n \"possible_keys\": [\"PRIMARY\"],\n \"r_loops\": 1,\n \"rows\": 199786,\n \"r_rows\": 109994,\n \"r_table_time_ms\": 232.699,\n \"r_other_time_ms\": 46.355,\n\n^ Now, ANALYZE prints timing information in members named r_..._time_ms. One\ncan see that so far, out of 30 seconds, only 232 millisecond were spent in\nreading the customer table. The bottleneck is elsewhere...\n\n\"filtered\": 100,\n \"r_filtered\": 9.085950143,\n \"attached_condition\": \"customer.`status` = \'GOLD\'\"\n }\n },\n {\n \"table\": {\n \"table_name\": \"orders\",\n \"access_type\": \"ref\",\n \"possible_keys\": [\"cust_id\"],\n \"key\": \"cust_id\",\n \"key_length\": \"5\",\n \"used_key_parts\": [\"cust_id\"],\n \"ref\": [\"test.customer.cust_id\"],\n \"r_loops\": 9994,\n \"rows\": 1,\n \"r_rows\": 99.99779868,\n \"r_table_time_ms\": 29460.609,\n \"r_other_time_ms\": 986.842,\n\n^ 29.4 seconds were spent reading the orders table (and 0.986 seconds in\nprocessing the obtained rows). Now we can see where the query is spending time.\n\n\"filtered\": 100,\n \"r_filtered\": 100\n }\n }\n ]\n }\n}\n\nURL: https://mariadb.com/kb/en/show-analyze/','','https://mariadb.com/kb/en/show-analyze/'); -insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (364,26,'SHOW AUTHORS','Syntax\n------\n\nSHOW AUTHORS\n\nDescription\n-----------\n\nThe SHOW AUTHORS statement displays information about the people who work on\nMariaDB. For each author, it displays Name, Location, and Comment values. All\ncolumns are encoded as latin1.\n\nThese include:\n\n* First the active people in MariaDB are listed.\n* Then the active people in MySQL.\n* Last the people that have contributed to MariaDB/MySQL in the past.\n\nThe order is somewhat related to importance of the contribution given to the\nMariaDB project, but this is not 100% accurate. There is still room for\nimprovement and debate...\n\nExample\n-------\n\nSHOW AUTHORS\\G\n*************************** 1. row ***************************\n Name: Michael (Monty) Widenius\nLocation: Tusby, Finland\n Comment: Lead developer and main author\n*************************** 2. row ***************************\n Name: Sergei Golubchik\nLocation: Kerpen, Germany\n Comment: Architect, Full-text search, precision math, plugin framework,\nmerges etc\n*************************** 3. row ***************************\n Name: Igor Babaev\nLocation: Bellevue, USA\n Comment: Optimizer, keycache, core work\n*************************** 4. row ***************************\n Name: Sergey Petrunia\nLocation: St. Petersburg, Russia\n Comment: Optimizer\n*************************** 5. row ***************************\n Name: Oleksandr Byelkin\nLocation: Lugansk, Ukraine\n Comment: Query Cache (4.0), Subqueries (4.1), Views (5.0)\n*************************** 6. row ***************************\n Name: Timour Katchaounov\nLocation: Sofia , Bulgaria\n Comment: Optimizer\n*************************** 7. row ***************************\n Name: Kristian Nielsen\nLocation: Copenhagen, Denmark\n Comment: Replication, Async client prototocol, General buildbot stuff\n*************************** 8. row ***************************\n Name: Alexander (Bar) Barkov\nLocation: Izhevsk, Russia\n Comment: Unicode and character sets\n*************************** 9. row ***************************\n Name: Alexey Botchkov (Holyfoot)\nLocation: Izhevsk, Russia\n Comment: GIS extensions, embedded server, precision math\n*************************** 10. row ***************************\n Name: Daniel Bartholomew\nLocation: Raleigh, USA\n Comment: MariaDB documentation, Buildbot, releases\n*************************** 11. row ***************************\n Name: Colin Charles\nLocation: Selangor, Malesia\n Comment: MariaDB documentation, talks at a LOT of conferences\n*************************** 12. row ***************************\n Name: Sergey Vojtovich\nLocation: Izhevsk, Russia\n Comment: initial implementation of plugin architecture, maintained native\nstorage engines (MyISAM, MEMORY, ARCHIVE, etc), rewrite of table cache\n*************************** 13. row ***************************\n Name: Vladislav Vaintroub\nLocation: Mannheim, Germany\n Comment: MariaDB Java connector, new thread pool, Windows optimizations\n*************************** 14. row ***************************\n Name: Elena Stepanova\nLocation: Sankt Petersburg, Russia\n Comment: QA, test cases\n*************************** 15. row ***************************\n Name: Georg Richter\nLocation: Heidelberg, Germany\n Comment: New LGPL C connector, PHP connector\n*************************** 16. row ***************************\n Name: Jan Lindström\nLocation: Ylämylly, Finland\n Comment: Working on InnoDB\n*************************** 17. row ***************************\n Name: Lixun Peng\nLocation: Hangzhou, China\n Comment: Multi Source replication\n*************************** 18. row ***************************\n Name: Olivier Bertrand\nLocation: Paris, France\n Comment: CONNECT storage engine\n*************************** 19. row ***************************\n Name: Kentoku Shiba\nLocation: Tokyo, Japan\n Comment: Spider storage engine, metadata_lock_info Information schema\n*************************** 20. row ***************************\n Name: Percona\nLocation: CA, USA\n Comment: XtraDB, microslow patches, extensions to slow log\n*************************** 21. row ***************************\n Name: Vicentiu Ciorbaru\nLocation: Bucharest, Romania\n Comment: Roles\n*************************** 22. row ***************************\n Name: Sudheera Palihakkara\nLocation: \n Comment: PCRE Regular Expressions\n*************************** 23. row ***************************\n Name: Pavel Ivanov\nLocation: USA\n Comment: Some patches and bug fixes\n*************************** 24. row ***************************\n Name: Konstantin Osipov\nLocation: Moscow, Russia\n Comment: Prepared statements (4.1), Cursors (5.0), GET_LOCK (10.0)\n*************************** 25. row ***************************\n Name: Ian Gilfillan\nLocation: South Africa\n Comment: MariaDB documentation\n*************************** 26. row ***************************\n Name: Federico Razolli\nLocation: Italy\n Comment: MariaDB documentation Italian translation\n*************************** 27. row ***************************\n Name: Guilhem Bichot\nLocation: Bordeaux, France\n Comment: Replication (since 4.0)\n*************************** 28. row ***************************\n Name: Andrei Elkin\nLocation: Espoo, Finland\n Comment: Replication\n*************************** 29. row ***************************\n Name: Dmitri Lenev\nLocation: Moscow, Russia\n Comment: Time zones support (4.1), Triggers (5.0)\n*************************** 30. row ***************************\n Name: Marc Alff\nLocation: Denver, CO, USA\n Comment: Signal, Resignal, Performance schema\n*************************** 31. row ***************************\n Name: Mikael Ronström\nLocation: Stockholm, Sweden\n Comment: NDB Cluster, Partitioning, online alter table\n*************************** 32. row ***************************\n Name: Ingo Strüwing\nLocation: Berlin, Germany\n Comment: Bug fixing in MyISAM, Merge tables etc\n*************************** 33. row ***************************\n Name: Marko Mäkelä\nLocation: Helsinki, Finland\n Comment: InnoDB core developer\n...\n\nURL: https://mariadb.com/kb/en/show-authors/','','https://mariadb.com/kb/en/show-authors/'); +insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (364,26,'SHOW AUTHORS','Syntax\n------\n\nSHOW AUTHORS\n\nDescription\n-----------\n\nThe SHOW AUTHORS statement displays information about the people who work on\nMariaDB. For each author, it displays Name, Location, and Comment values. All\ncolumns are encoded as latin1.\n\nThese include:\n\n* First the active people in MariaDB are listed.\n* Then the active people in MySQL.\n* Last the people that have contributed to MariaDB/MySQL in the past.\n\nThe order is somewhat related to importance of the contribution given to the\nMariaDB project, but this is not 100% accurate. There is still room for\nimprovement and debate...\n\nExample\n-------\n\nSHOW AUTHORS\\G\n*************************** 1. row ***************************\n Name: Michael (Monty) Widenius\nLocation: Tusby, Finland\n Comment: Lead developer and main author\n*************************** 2. row ***************************\n Name: Sergei Golubchik\nLocation: Kerpen, Germany\n Comment: Architect, Full-text search, precision math, plugin framework,\nmerges etc\n*************************** 3. row ***************************\n Name: Igor Babaev\nLocation: Bellevue, USA\n Comment: Optimizer, keycache, core work\n*************************** 4. row ***************************\n Name: Sergey Petrunia\nLocation: St. Petersburg, Russia\n Comment: Optimizer\n*************************** 5. row ***************************\n Name: Oleksandr Byelkin\nLocation: Lugansk, Ukraine\n Comment: Query Cache (4.0), Subqueries (4.1), Views (5.0)\n*************************** 6. row ***************************\n Name: Timour Katchaounov\nLocation: Sofia , Bulgaria\n Comment: Optimizer\n*************************** 7. row ***************************\n Name: Kristian Nielsen\nLocation: Copenhagen, Denmark\n Comment: Replication, Async client protocol, General buildbot stuff\n*************************** 8. row ***************************\n Name: Alexander (Bar) Barkov\nLocation: Izhevsk, Russia\n Comment: Unicode and character sets\n*************************** 9. row ***************************\n Name: Alexey Botchkov (Holyfoot)\nLocation: Izhevsk, Russia\n Comment: GIS extensions, embedded server, precision math\n*************************** 10. row ***************************\n Name: Daniel Bartholomew\nLocation: Raleigh, USA\n Comment: MariaDB documentation, Buildbot, releases\n*************************** 11. row ***************************\n Name: Colin Charles\nLocation: Selangor, Malesia\n Comment: MariaDB documentation, talks at a LOT of conferences\n*************************** 12. row ***************************\n Name: Sergey Vojtovich\nLocation: Izhevsk, Russia\n Comment: initial implementation of plugin architecture, maintained native\nstorage engines (MyISAM, MEMORY, ARCHIVE, etc), rewrite of table cache\n*************************** 13. row ***************************\n Name: Vladislav Vaintroub\nLocation: Mannheim, Germany\n Comment: MariaDB Java connector, new thread pool, Windows optimizations\n*************************** 14. row ***************************\n Name: Elena Stepanova\nLocation: Sankt Petersburg, Russia\n Comment: QA, test cases\n*************************** 15. row ***************************\n Name: Georg Richter\nLocation: Heidelberg, Germany\n Comment: New LGPL C connector, PHP connector\n*************************** 16. row ***************************\n Name: Jan Lindström\nLocation: Ylämylly, Finland\n Comment: Working on InnoDB\n*************************** 17. row ***************************\n Name: Lixun Peng\nLocation: Hangzhou, China\n Comment: Multi Source replication\n*************************** 18. row ***************************\n Name: Olivier Bertrand\nLocation: Paris, France\n Comment: CONNECT storage engine\n*************************** 19. row ***************************\n Name: Kentoku Shiba\nLocation: Tokyo, Japan\n Comment: Spider storage engine, metadata_lock_info Information schema\n*************************** 20. row ***************************\n Name: Percona\nLocation: CA, USA\n Comment: XtraDB, microslow patches, extensions to slow log\n*************************** 21. row ***************************\n Name: Vicentiu Ciorbaru\nLocation: Bucharest, Romania\n Comment: Roles\n*************************** 22. row ***************************\n Name: Sudheera Palihakkara\nLocation: \n Comment: PCRE Regular Expressions\n*************************** 23. row ***************************\n Name: Pavel Ivanov\nLocation: USA\n Comment: Some patches and bug fixes\n*************************** 24. row ***************************\n Name: Konstantin Osipov\nLocation: Moscow, Russia\n Comment: Prepared statements (4.1), Cursors (5.0), GET_LOCK (10.0)\n*************************** 25. row ***************************\n Name: Ian Gilfillan\nLocation: South Africa\n Comment: MariaDB documentation\n*************************** 26. row ***************************\n Name: Federico Razolli\nLocation: Italy\n Comment: MariaDB documentation Italian translation\n*************************** 27. row ***************************\n Name: Guilhem Bichot\nLocation: Bordeaux, France\n Comment: Replication (since 4.0)\n*************************** 28. row ***************************\n Name: Andrei Elkin\nLocation: Espoo, Finland\n Comment: Replication\n*************************** 29. row ***************************\n Name: Dmitri Lenev\nLocation: Moscow, Russia\n Comment: Time zones support (4.1), Triggers (5.0)\n*************************** 30. row ***************************\n Name: Marc Alff\nLocation: Denver, CO, USA\n Comment: Signal, Resignal, Performance schema\n*************************** 31. row ***************************\n Name: Mikael Ronström\nLocation: Stockholm, Sweden\n Comment: NDB Cluster, Partitioning, online alter table\n*************************** 32. row ***************************\n Name: Ingo Strüwing\nLocation: Berlin, Germany\n Comment: Bug fixing in MyISAM, Merge tables etc\n*************************** 33. row ***************************\n Name: Marko Mäkelä\nLocation: Helsinki, Finland\n Comment: InnoDB core developer\n...\n\nURL: https://mariadb.com/kb/en/show-authors/','','https://mariadb.com/kb/en/show-authors/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (365,26,'SHOW BINARY LOGS','Syntax\n------\n\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nDescription\n-----------\n\nLists the binary log files on the server. This statement is used as part of\nthe procedure described in PURGE BINARY LOGS, that shows how to determine\nwhich logs can be purged.\n\nThis statement requires the SUPER privilege, the REPLICATION_CLIENT privilege,\nor, from MariaDB 10.5.2, the BINLOG MONITOR privilege.\n\nExamples\n--------\n\nSHOW BINARY LOGS;\n+--------------------+-----------+\n| Log_name | File_size |\n+--------------------+-----------+\n| mariadb-bin.000001 | 19039 |\n| mariadb-bin.000002 | 717389 |\n| mariadb-bin.000003 | 300 |\n| mariadb-bin.000004 | 333 |\n| mariadb-bin.000005 | 899 |\n| mariadb-bin.000006 | 125 |\n| mariadb-bin.000007 | 18907 |\n| mariadb-bin.000008 | 19530 |\n| mariadb-bin.000009 | 151 |\n| mariadb-bin.000010 | 151 |\n| mariadb-bin.000011 | 125 |\n| mariadb-bin.000012 | 151 |\n| mariadb-bin.000013 | 151 |\n| mariadb-bin.000014 | 125 |\n| mariadb-bin.000015 | 151 |\n| mariadb-bin.000016 | 314 |\n+--------------------+-----------+\n\nURL: https://mariadb.com/kb/en/show-binary-logs/','','https://mariadb.com/kb/en/show-binary-logs/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (366,26,'SHOW BINLOG EVENTS','Syntax\n------\n\nSHOW BINLOG EVENTS\n [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\n\nDescription\n-----------\n\nShows the events in the binary log. If you do not specify \'log_name\', the\nfirst binary log is displayed.\n\nRequires the BINLOG MONITOR privilege (>= MariaDB 10.5.2) or the REPLICATION\nSLAVE privilege (<= MariaDB 10.5.1).\n\nExample\n-------\n\nSHOW BINLOG EVENTS IN \'mysql_sandbox10019-bin.000002\';\n+-------------------------------+-----+-------------------+-----------+--------\n----+------------------------------------------------+\n| Log_name | Pos | Event_type | Server_id |\nEnd_log_pos | Info |\n+-------------------------------+-----+-------------------+-----------+--------\n----+------------------------------------------------+\n| mysql_sandbox10019-bin.000002 | 4 | Format_desc | 1 | \n 248 | Server ver: 10.0.19-MariaDB-log, Binlog ver: 4 |\n| mysql_sandbox10019-bin.000002 | 248 | Gtid_list | 1 | \n 273 | [] |\n| mysql_sandbox10019-bin.000002 | 273 | Binlog_checkpoint | 1 | \n 325 | mysql_sandbox10019-bin.000002 |\n| mysql_sandbox10019-bin.000002 | 325 | Gtid | 1 | \n 363 | GTID 0-1-1 |\n| mysql_sandbox10019-bin.000002 | 363 | Query | 1 | \n 446 | CREATE DATABASE blog |\n| mysql_sandbox10019-bin.000002 | 446 | Gtid | 1 | \n 484 | GTID 0-1-2 |\n| mysql_sandbox10019-bin.000002 | 484 | Query | 1 | \n 571 | use `blog`; CREATE TABLE bb (id INT) |\n+-------------------------------+-----+-------------------+-----------+--------\n----+------------------------------------------------+\n\nURL: https://mariadb.com/kb/en/show-binlog-events/','','https://mariadb.com/kb/en/show-binlog-events/'); insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (367,26,'SHOW CHARACTER SET','Syntax\n------\n\nSHOW CHARACTER SET\n [LIKE \'pattern\' | WHERE expr]\n\nDescription\n-----------\n\nThe SHOW CHARACTER SET statement shows all available character sets. The LIKE\nclause, if present on its own, indicates which character set names to match.\nThe WHERE and LIKE clauses can be given to select rows using more general\nconditions, as discussed in Extended SHOW.\n\nThe same information can be queried from the Information Schema CHARACTER_SETS\ntable.\n\nSee Setting Character Sets and Collations for details on specifying the\ncharacter set at the server, database, table and column levels.\n\nExamples\n--------\n\nSHOW CHARACTER SET LIKE \'latin%\';\n+---------+-----------------------------+-------------------+--------+\n| Charset | Description | Default collation | Maxlen |\n+---------+-----------------------------+-------------------+--------+\n| latin1 | cp1252 West European | latin1_swedish_ci | 1 |\n| latin2 | ISO 8859-2 Central European | latin2_general_ci | 1 |\n| latin5 | ISO 8859-9 Turkish | latin5_turkish_ci | 1 |\n| latin7 | ISO 8859-13 Baltic | latin7_general_ci | 1 |\n+---------+-----------------------------+-------------------+--------+\n\nSHOW CHARACTER SET WHERE Maxlen LIKE \'2\';\n+---------+---------------------------+-------------------+--------+\n| Charset | Description | Default collation | Maxlen |\n+---------+---------------------------+-------------------+--------+\n| big5 | Big5 Traditional Chinese | big5_chinese_ci | 2 |\n| sjis | Shift-JIS Japanese | sjis_japanese_ci | 2 |\n| euckr | EUC-KR Korean | euckr_korean_ci | 2 |\n| gb2312 | GB2312 Simplified Chinese | gb2312_chinese_ci | 2 |\n| gbk | GBK Simplified Chinese | gbk_chinese_ci | 2 |\n| ucs2 | UCS-2 Unicode | ucs2_general_ci | 2 |\n| cp932 | SJIS for Windows Japanese | cp932_japanese_ci | 2 |\n+---------+---------------------------+-------------------+--------+\n\nURL: https://mariadb.com/kb/en/show-character-set/','','https://mariadb.com/kb/en/show-character-set/'); diff --git a/scripts/mariadb_system_tables_fix.sql b/scripts/mariadb_system_tables_fix.sql index 16ce0775d3b39..93a266e2d4b16 100644 --- a/scripts/mariadb_system_tables_fix.sql +++ b/scripts/mariadb_system_tables_fix.sql @@ -786,7 +786,7 @@ DELIMITER ; -- Get warnings (if any) SHOW WARNINGS; -# Convering the host name to lower case for existing users +# Converting the host name to lower case for existing users UPDATE user SET host=LOWER( host ) WHERE LOWER( host ) <> host; DELIMITER // diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index 71f77cf8a11ff..c2d980f453e40 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -121,7 +121,7 @@ Usage: $script [host [user [db]]] OPTIONS Note: At least the user and the db must be given (even with wildcards) If no host is given, `localhost' is assumed - Wilcards (*,?,%,_) are allowed for host, user and db, but be sure + Wildcards (*,?,%,_) are allowed for host, user and db, but be sure to escape them from your shell!! (ie type \\* or '*') _OPTIONS @@ -163,7 +163,7 @@ Release Notes: - bugfix: the user-field should not be treated as a sql-regexpr, but as a plain string. - bugfix: the host-table should not be used if the host isn't empty in db - or if the host isn't emty in user + or if the host isn't empty in user (Monty) 1.0-beta4: (1997-03-14) @@ -331,7 +331,7 @@ $TODO = <<_TODO; ----- -a full where clause is use now. How can we handle older servers? -add some more functionality for DNS. - -select the warnings more carefuly. + -select the warnings more carefully. >> I think that the warnings should either be enhanced to _really_ >> understand and report real problems accurately, or restricted to >> only printing things that it knows with 100% certainty. 8 -# Normally nothing should be changed beneeth this line +# Normally nothing should be changed beneath this line # **************************** @@ -611,7 +611,7 @@ if (@MySQLaccess::Grant::Error) { } #----------------------- -# get info/help if necc. +# get info/help if necessary. $print_usage=1; if ( defined($Param{'version'}) ) { MySQLaccess::Report::Print_Version(); diff --git a/scripts/mytop.sh b/scripts/mytop.sh index bf4a16cc35bb9..c8f0de7b0969c 100644 --- a/scripts/mytop.sh +++ b/scripts/mytop.sh @@ -457,7 +457,7 @@ while (1) ReadKey(0); } - ## l - change long running hightling + ## l - change long running queries highlighting if ($key eq 'l') { @@ -1443,7 +1443,7 @@ sub GetData() ## Strip non printing control symbols $thread->{Info} =~ tr/[[:cntrl:]]//; - ## Collpase whitespace + ## Collapse whitespace $thread->{Info} =~ s/\s+/ /g; ## Trailing space removal @@ -2123,7 +2123,7 @@ modules. =head2 Optional Color Support -In additon, if you want a color B (recommended), install +In addition, if you want a color B (recommended), install Term::ANSIColor from the CPAN: http://search.cpan.org/search?dist=ANSIColor @@ -2197,7 +2197,7 @@ slow queries, and the percentage of Select, Insert, Update, and Delete queries. The third real-time values. First is the number of queries per second, -then the number of slow queries, followed by query precentages (like +then the number of slow queries, followed by query percentages (like on the previous line). And the fourth line displays key buffer efficiency (how often keys are @@ -2493,7 +2493,7 @@ Reset the server's status counters via a I command. =item B -Togle IP reverse lookup. Default is on. +Toggle IP reverse lookup. Default is on. =item B diff --git a/scripts/sys_schema/README.md b/scripts/sys_schema/README.md index 6c09306993f65..46320d57ddb74 100644 --- a/scripts/sys_schema/README.md +++ b/scripts/sys_schema/README.md @@ -1291,7 +1291,7 @@ mariadb> DESC metrics; +----------------+--------------+------+-----+---------+-------+ 4 rows in set (0.00 sec) -mysq> DESC metrics_56; +mysql> DESC metrics_56; +----------------+--------------+------+-----+---------+-------+ | Field | Type | Null | Key | Default | Extra | +----------------+--------------+------+-----+---------+-------+ diff --git a/scripts/sys_schema/views/p_s/metrics_56.sql b/scripts/sys_schema/views/p_s/metrics_56.sql index 79447ae7b025d..7d3610b56de8d 100644 --- a/scripts/sys_schema/views/p_s/metrics_56.sql +++ b/scripts/sys_schema/views/p_s/metrics_56.sql @@ -24,7 +24,7 @@ -- * Current time -- -- This is the same as the metrics view with the exception that the global status is taken from information_schema.GLOBAL_STATUS instead of --- from the Peformance Schema. Use this view if one of the following conditions are fulfilled: +-- from the Performance Schema. Use this view if one of the following conditions are fulfilled: -- -- * The MySQL version is 5.6 or 5.7.0-5.7.5 -- * In 5.7.6 and later if show_compatibility_56 is ON. See also https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_show_compatibility_56 diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index ac42c7ffae526..f061a2fb58b3f 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -568,7 +568,7 @@ read_cnf() if [ "$tmode" != 'DISABLED' ]; then if [ 0 -eq $encrypt -a -n "$tpem" -a -n "$tkey" ] then - encrypt=3 # enable cert/key SSL encyption + encrypt=3 # enable cert/key SSL encryption # avoid CA verification if not set explicitly: # nodes may happen to have different CA if self-generated, # zeroing up tcert and tcap does the trick: diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 43c26aef1d573..1e54279b5c374 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -19,7 +19,7 @@ set -ue # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston # MA 02110-1335 USA. -# This is a reference script for mariadb-dump-based state snapshot tansfer. +# This is a reference script for mariadb-dump-based state snapshot transfer. . $(dirname "$0")/wsrep_sst_common diff --git a/sql-bench/Comments/Empress.crash-me b/sql-bench/Comments/Empress.crash-me index b60bf4f19a9e0..d3f8a2dff6460 100644 --- a/sql-bench/Comments/Empress.crash-me +++ b/sql-bench/Comments/Empress.crash-me @@ -65,7 +65,7 @@ killed it ... restarting at 205 ... hope this will work .... won't think so ... give it 2 minutes ... taking 12 mb ... killed it ...restarting at ... 40 ... yes it crashes ... - 7 is crashing ... 1 ....is good .. finaly ... a long way ... + 7 is crashing ... 1 ....is good .. finally ... a long way ... now max stacked expressions .... taking 80 mb ... mmmm what sort of test is this ...it looks more like a harddisk test .. but it crashes .. nice ... mmm a YACC overflow ... that's a nice error ... diff --git a/sql-bench/Comments/interbase b/sql-bench/Comments/interbase index addaf74b63f40..ff159829f3248 100644 --- a/sql-bench/Comments/interbase +++ b/sql-bench/Comments/interbase @@ -11,8 +11,8 @@ There were some problems during the execution: writes gds__alloc: non-positive size allocation request to log file. - This problem has both models. I am not shure if it's interbase or - DBD:InterBase problem (though DBD::InterBase made all nesessary + This problem has both models. I am not sure if it's interbase or + DBD:InterBase problem (though DBD::InterBase made all necessary tests during the installation without any problem) 2) In "superserver" mode ibserver several times died (and ibguard restarted it) diff --git a/sql-bench/Comments/postgres.benchmark b/sql-bench/Comments/postgres.benchmark index c52a53699e0ed..519bdadff07d4 100644 --- a/sql-bench/Comments/postgres.benchmark +++ b/sql-bench/Comments/postgres.benchmark @@ -9,7 +9,7 @@ # 'no such file or directory' error and never recovered from that! # # Another time vacuum() filled our system disk with had 6G free -# while vaccuming a table of 60 M. +# while vacuuming a table of 60 M. # # WARNING @@ -84,7 +84,7 @@ run-all-tests --comment="Intel Xeon, 2x550 Mhz, 512M, pg started with -o -F" --u # When running with --fast we run the following vacuum commands on # the database between each major update of the tables: -# vacuum anlyze table +# vacuum analyze table # vacuum table # or # vacuum analyze diff --git a/sql-bench/Comments/postgres.crash-me b/sql-bench/Comments/postgres.crash-me index c693817cc91a3..655cb6983bdf3 100644 --- a/sql-bench/Comments/postgres.crash-me +++ b/sql-bench/Comments/postgres.crash-me @@ -11,12 +11,12 @@ I am happy to have 400mb swap ... so he can do have it ... but other programs will give some errors ... just a second ago ... vim core dumped .. XFree crashed full ... to the prompt the menu bar of redhat disappeared .... -at this momemt the max is 215 mb memore postgres is taking ... +at this moment the max is 215 mb memory postgres is taking ... the problem with postgres is the following error: -PQexec() -- Request was sent to backend, but backend closed the channel before r -esponding. This probably means the backend terminated abnormally before or whil -e processing the request +PQexec() -- Request was sent to backend, but backend closed the channel before +responding. This probably means the backend terminated abnormally before or while +processing the request I think we can solve this with a goto command ... to go back again ... after the connect again ... diff --git a/sql-bench/README b/sql-bench/README index 431659a875688..aa21d2465968c 100644 --- a/sql-bench/README +++ b/sql-bench/README @@ -50,7 +50,7 @@ run-all-tests Use this to run all tests. When all tests are run, compare-results Generates a comparison table from different RUN files. server-cfg Contains the limits and functions for all supported SQL servers. If you want to add a new server, this - should be the only file that neads to be changed. + should be the only file that needs to be changed. Most of the tests should use portable SQL to make it possible to diff --git a/sql-bench/copy-db.sh b/sql-bench/copy-db.sh index 96efb0c58c22f..43be5b56115e0 100644 --- a/sql-bench/copy-db.sh +++ b/sql-bench/copy-db.sh @@ -62,7 +62,7 @@ sub usage $0 version $VER by Monty Copies tables between two database servers. If the destination table doesn\'t - exist it\'s autoamticly created. If the destination table exists, it + exist it\'s automatically created. If the destination table exists, it should be compatible with the source table. Because DBI doesn\'t provide full information about the columns in a table, diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh index c398e0d3b9780..1d832dc72b887 100644 --- a/sql-bench/crash-me.sh +++ b/sql-bench/crash-me.sh @@ -568,7 +568,7 @@ if (!defined($limits{'query_size'})) $end = $limits{'restart'}{'tohigh'} - 1; print "\nRestarting this with low limit: $first and high limit: $end\n"; delete $limits{'restart'}; - $first=$first+int(($end-$first+4)/5); # Prefere lower on errors + $first=$first+int(($end-$first+4)/5); # Prefer lower on errors } for ($i=$first ; $i < $end ; $i*=2) { @@ -1101,7 +1101,7 @@ foreach $types (@types) $type->[3],$type->[4]); if (!$result) { - # check without type specifyer + # check without type specifier if ($type->[2] =~ /DATE /) { my $tmp= $type->[2]; @@ -3142,7 +3142,7 @@ $0 takes the following options: This causes rows starting with ' ###' to be logged into the .cnf file --noverbose - Don't log '###' quries to the .cnf file. + Don't log '###' queries to the .cnf file. EOF exit(0); @@ -4167,7 +4167,7 @@ sub safe_query_result # # Find limit using binary search. This is a weighed binary search that -# will prefere lower limits to get the server to crash as +# will prefer lower limits to get the server to crash as # few times as possible @@ -4227,7 +4227,7 @@ sub find_limit() $end--; print "\nRestarting this with low limit: $first and high limit: $end\n"; delete $limits{'restart'}; - $i=$first+int(($end-$first+4)/5); # Prefere lower on errors + $i=$first+int(($end-$first+4)/5); # Prefer lower on errors } else { @@ -4250,7 +4250,7 @@ sub find_limit() { $end=$i-1; $log_str .= " $i:FAIL"; - $i=$first+int(($end-$first+4)/5); # Prefere lower on errors + $i=$first+int(($end-$first+4)/5); # Prefer lower on errors } } } @@ -4353,7 +4353,7 @@ sub save_config_data print CONFIG_FILE "$key=$limit\t# $prompt\n"; $limits{$key}=$limit; $limit_changed=1; -# now write log lines (immediatelly after limits) +# now write log lines (immediately after limits) my $line; my $last_line_was_empty=0; foreach $line (split /\n/, $log{$key}) diff --git a/sql-bench/graph-compare-results.sh b/sql-bench/graph-compare-results.sh index d43f722cb147c..88d9189d9ffba 100755 --- a/sql-bench/graph-compare-results.sh +++ b/sql-bench/graph-compare-results.sh @@ -372,7 +372,7 @@ sub calculate { $highest = 1; # set hard the highest value ... $xhigh = int($highest + .5 * $highest); - # here to get the max lenght of the test entries ... + # here to get the max length of the test entries ... # so we can calculate the with of the left border foreach $oper (sort keys (%op)) { $max_len_lb = length($oper) if (length($oper) > $max_len_lb); @@ -418,7 +418,7 @@ sub gd { $width = $width_greyfield + $left_border + $right_border; $height = ($step * ($luukcounter + ($luukcounter * ($#key_order + 1)))) + $down_border + $up_border; $b_width = $width - ($left_border + $right_border); # width within the grey field - $overlap = 0; # how far each colum can fall over each other ...nice :-) + $overlap = 0; # how far each column can fall over each other ...nice :-) # make the gif image .... $im = new GD::Image($width,$height); diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index d8b2a16310f51..fb354fe031c29 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -983,7 +983,7 @@ sub insert_file { } # solid can't handle an alias in a having statement so -# select test as foo from tmp group by foo having foor > 2 +# select test as foo from tmp group by foo having foo > 2 # becomes # select test as foo from tmp group by foo having test > 2 # @@ -3262,7 +3262,7 @@ sub new # We don't get an error for duplicate row in 'test-insert' $limits{'unique_index'} = 0; # Unique index works or not - # We can't use a blob as a normal string (we got a wierd error) + # We can't use a blob as a normal string (we got a weird error) $limits{'working_blobs'} = 0; # 'select min(region),max(region) from bench1' kills the server after a while $limits{'group_func_sql_min_str'} = 0; diff --git a/sql/field.h b/sql/field.h index be8abec29891e..7a6edeeeacd3b 100644 --- a/sql/field.h +++ b/sql/field.h @@ -897,7 +897,7 @@ class Field: public Value_source Column_statistics_collected *collected_stats; /* - This is additional data provided for any computed(virtual) field, + This is additional data provided for any computed (virtual) field, default function or check constraint. In particular it includes a pointer to the item by which this field can be computed from other fields. @@ -5422,8 +5422,8 @@ class Column_definition: public Sql_alloc, bool explicitly_nullable; /* - This is additinal data provided for any computed(virtual) field. - In particular it includes a pointer to the item by which this field + This is additional data provided for any computed (virtual) field. + In particular it includes a pointer to the item by which this field can be computed from other fields. */ Virtual_column_info diff --git a/sql/handler.cc b/sql/handler.cc index fa7e86f172a5e..735d6c54b1945 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3266,7 +3266,7 @@ Lex_cstring handler::get_canonical_filename(const Lex_cstring &path, Otherwise, in case if either of the table name or the database name starts with '#mysql50#', it's probably not correct to lower-case using - files_charset_info. Shoudn't we lower-case '#mysql50#name' using + files_charset_info. Shouldn't we lower-case '#mysql50#name' using character_set_filesystem instead? */ return buff->set_casedn(path.left(mysql_data_home_len), @@ -8406,7 +8406,7 @@ int handler::ha_delete_row(const uchar *buf) In a Spider cluster the direct update operation is pushed down to the child levels of the cluster. - Note that this can't be used in case of statment logging + Note that this can't be used in case of statement logging @param update_rows Number of updated rows. diff --git a/sql/handler.h b/sql/handler.h index bbd49b35f1984..c6d44534a60cf 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -3860,7 +3860,7 @@ class handler :public Sql_alloc /* Set handler optimizer cost variables. - Called for each table used by the statment + Called for each table used by the statement This is virtual mainly for the partition engine. */ virtual void set_optimizer_costs(THD *thd); diff --git a/sql/item.cc b/sql/item.cc index 6e144b0589d56..87e652ed059f0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5252,7 +5252,7 @@ Item_param::set_value(THD *thd, sp_rcontext *ctx, Item **it) set_null_string(arg->collation); return false; } - /* It is wrapper => other set_* shoud set null_value */ + /* It is wrapper => other set_* should set null_value */ DBUG_ASSERT(null_value == false); return false; } @@ -9661,7 +9661,7 @@ void Item_ref::fix_after_pullout(st_select_lex *new_parent, Item **refptr, Mark references from inner selects used in group by clause The method is used by the walk method when called for the expressions - from the group by clause. The callsare occurred in the function + from the group by clause. The calls occur in the function fix_inner_refs invoked by JOIN::prepare. The parameter passed to Item_outer_ref::check_inner_refs_processor is the iterator over the list of inner references from the subselects diff --git a/sql/item.h b/sql/item.h index 15226a91558eb..7ffe458a63950 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1365,7 +1365,7 @@ class Item :public Value_source, The value of const is supplied implicitly as the value this item's argument, the form of $CMP$ comparison is specified through the - function's arguments. The calle returns the result interval + function's arguments. The call returns the result interval F(x) $CMP2$ F(const) @@ -2033,7 +2033,7 @@ class Item :public Value_source, void print_value(String *str); virtual void update_used_tables() {} - virtual COND *build_equal_items(THD *thd, COND_EQUAL *inheited, + virtual COND *build_equal_items(THD *thd, COND_EQUAL *inherited, bool link_item_fields, COND_EQUAL **cond_equal_ref) { @@ -2837,7 +2837,7 @@ bool cmp_items(Item *a, Item *b); /** - Array of items, e.g. function or aggerate function arguments. + Array of items, e.g. function or aggregate function arguments. */ class Item_args { diff --git a/sql/item_func.h b/sql/item_func.h index 3783797f142fb..4f5c973951c65 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2279,7 +2279,7 @@ class Item_func_rownum final :public Item_longlong_func { /* This points to a variable that contains the number of rows - accpted so far in the result set + accepted so far in the result set */ ha_rows *accepted_rows; SELECT_LEX *select; diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 3ffb99a225860..0eafe32767437 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -519,7 +519,7 @@ void Item_sum::print(String *str, enum_query_type query_type) /* TODO: The fact that func_name() may return a name with an extra '(' - is really annoying. This shoud be fixed. + is really annoying. This should be fixed. */ if (!is_aggr_sum_func()) str->append('('); diff --git a/sql/item_sum.h b/sql/item_sum.h index 6a6b463220cfc..125d7f885c9d0 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -69,7 +69,7 @@ class Aggregator : public Sql_alloc /** Called when we need to wipe out all the data from the aggregator : - all the values acumulated and all the state. + all the values accumulated and all the state. Cleans up the internal structures and resets them to their initial state. */ virtual void clear() = 0; diff --git a/sql/log_event_client.cc b/sql/log_event_client.cc index 119ab047b2fd7..57f41d5897152 100644 --- a/sql/log_event_client.cc +++ b/sql/log_event_client.cc @@ -2830,7 +2830,7 @@ bool copy_cache_to_string_wrapped(IO_CACHE *cache, bool is_verbose) { const my_off_t cache_size= my_b_tell(cache); - // contribution to total size estimate of formating + // contribution to total size estimate of formatting const size_t fmt_size= sizeof(str_binlog) + 2*(sizeof(fmt_frag) + 2 /* %d */) + sizeof(fmt_delim) + sizeof(fmt_n_delim) + diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index 8a824eff582e2..b935f3eafd37a 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -2082,7 +2082,7 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi, { /* To be compatible with previous releases, the slave thread uses the global - log_slow_disabled_statements value, wich can be changed dynamically, so we + log_slow_disabled_statements value, which can be changed dynamically, so we have to set the sql_log_slow respectively. */ thd->variables.sql_log_slow= !MY_TEST(global_system_variables.log_slow_disabled_statements & LOG_SLOW_DISABLE_SLAVE); diff --git a/sql/mdl.h b/sql/mdl.h index aa271cb6d093d..00a129810f039 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -311,7 +311,7 @@ enum enum_mdl_type { Statement is modifying data, but will not block MDL_BACKUP_DDL or earlier BACKUP stages. ALTER TABLE is started with MDL_BACKUP_DDL, but changed to - MDL_BACKUP_ALTER_COPY while alter table is copying or modifing data. + MDL_BACKUP_ALTER_COPY while alter table is copying or modifying data. */ #define MDL_BACKUP_ALTER_COPY enum_mdl_type(12) diff --git a/sql/my_json_writer.h b/sql/my_json_writer.h index ccc33cfb6081e..06c45ab83b569 100644 --- a/sql/my_json_writer.h +++ b/sql/my_json_writer.h @@ -76,7 +76,7 @@ class Single_line_formatting_helper }; /* - This works like a finite automaton. + This works like a finite automation. state=DISABLED means the helper is disabled - all on_XXX functions will return false (which means "not handled") and do nothing. diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d4e8e9156ff20..7e383aed71ae6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -9621,7 +9621,7 @@ PSI_stage_info stage_waiting_for_flush= { 0, "Waiting for non trans tables to be PSI_stage_info stage_waiting_for_ddl= { 0, "Waiting for DDLs", 0}; #ifdef WITH_WSREP -// Aditional Galera thread states +// Additional Galera thread states PSI_stage_info stage_waiting_isolation= { 0, "Waiting to execute in isolation", 0}; PSI_stage_info stage_waiting_certification= {0, "Waiting for certification", 0}; PSI_stage_info stage_waiting_ddl= {0, "Waiting for TOI DDL", 0}; diff --git a/sql/mysqld.h b/sql/mysqld.h index 0349487587217..b4847d4f158f2 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -861,7 +861,7 @@ enum enum_query_type QT_SHOW_SELECT_NUMBER= (1<<10), /// Do not print database name or table name in the identifiers (even if - /// this means the printout will be ambigous). It is assumed that the caller + /// this means the printout will be ambiguous). It is assumed that the caller /// passing this flag knows what they are doing. QT_ITEM_IDENT_DISABLE_DB_TABLE_NAMES= (1 <<11), diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index 3dee9f34bd581..2dcb8cf5eb201 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -670,7 +670,7 @@ int Histogram_json_hb::parse_bucket(json_engine_t *je, Field *field, } save1.restore_to(je); - // Less common endoints: + // Less common endpoints: Json_string start_hex_str("start_hex"); if (json_key_matches(je, start_hex_str.get())) { diff --git a/sql/opt_trace.cc b/sql/opt_trace.cc index 122102ffbfbdc..43454f659cb42 100644 --- a/sql/opt_trace.cc +++ b/sql/opt_trace.cc @@ -481,7 +481,7 @@ void Opt_trace_start::init(THD *thd, const CHARSET_INFO *query_charset) { /* - if optimizer trace is enabled and the statment we have is traceable, + if optimizer trace is enabled and the statement we have is traceable, then we start the context. */ const ulonglong var= thd->variables.optimizer_trace; diff --git a/sql/protocol.cc b/sql/protocol.cc index aba884bb63428..b4f3204aeacb1 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -962,7 +962,7 @@ bool Protocol_text::store_field_metadata(const THD * thd, Detect whether column info can be changed without PS repreparing. - Such colum info is called fragile. The opposite of + Such column info is called fragile. The opposite of fragile is. diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 57c27eb51066b..2d0d9239f4696 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -2902,7 +2902,7 @@ gtid_waiting::wait_for_gtid(THD *thd, rpl_gtid *wait_gtid, /* The elements in the gtid_slave_state_hash are never re-allocated once they enter the hash, so we do not need to re-do the lookup after releasing - and re-aquiring the lock. + and re-acquiring the lock. */ if (!slave_state_elem && !(slave_state_elem= rpl_global_gtid_slave_state->get_element(domain_id))) @@ -3004,7 +3004,7 @@ gtid_waiting::wait_for_gtid(THD *thd, rpl_gtid *wait_gtid, /* Note that hash_entry pointers do not change once allocated, so we do - not need to lookup `he' again after re-aquiring LOCK_gtid_waiting. + not need to lookup `he' again after re-acquiring LOCK_gtid_waiting. */ process_wait_hash(wakeup_seq_no, he); } diff --git a/sql/share/README.md b/sql/share/README.md index f0041345b2eff..c838e4a370054 100644 --- a/sql/share/README.md +++ b/sql/share/README.md @@ -27,7 +27,7 @@ Note that Google translate removes the leading whitespace in the translation fil 3. Give the translated file an appropriate name (e.g. `all_swahili_text_in_errmsg-utf8.txt`) and store it in the same directory with `errmsg-utf8.txt` and `all_english_text_in_errmsg-utf8.txt`. These 3 files will be used by the script insert_translations_into_errmsg.py. -4. Proof check the auto-translations in the file you downloaded from Google translate. Note that Google might ommit formating information +4. Proof check the auto-translations in the file you downloaded from Google translate. Note that Google might omit formatting information that will cause the compilation of MariaDB to fail, so pay attention to these. 5. Reintegrate these translations into the errmsg-utf8.txt by running the insert_translations_into_errmsg.py script as follows: diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index cec3bfcf7be18..7fda1c48e6a9a 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -385,7 +385,7 @@ To make maintaining easier please: Cyrillic KOI8-U Ukrainian koi8-u - + diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index e83ca657ab161..08e50de4d58ed 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -2233,7 +2233,7 @@ ER_BLOBS_AND_NO_TERMINATED 42000 S1009 est "BLOB-tüüpi väljade olemasolul ei saa kasutada fikseeritud väljapikkust. Vajalik 'fields terminated by' määrang" fre "Vous ne pouvez utiliser des lignes de longueur fixe avec des BLOBs. Utiliser 'fields terminated by'" ger "Eine feste Zeilenlänge kann für BLOB-Felder nicht verwendet werden. Bitte 'fields terminated by' verwenden" - geo "ფიქსირებულზომიანი მწკრივის სიგრძეს BLOB-თან ერთად ვერ გამოიყენებთ. გამოიყენეთ 'fieds terminated by'" + geo "ფიქსირებულზომიანი მწკრივის სიგრძეს BLOB-თან ერთად ვერ გამოიყენებთ. გამოიყენეთ 'fields terminated by'" greek "Δεν μπορείτε να χρησιμοποιήσετε fixed rowlength σε BLOBs. Παρακαλώ χρησιμοποιείστε 'fields terminated by'" hindi "BLOBs को निश्चित लंबाई की पंक्ति के साथ प्रयोग नहीं किया जा सकता है; 'FIELDS TERMINATED BY' का इस्तेमाल करें" hun "Fix hosszusagu BLOB-ok nem hasznalhatok. Hasznalja a 'mezoelvalaszto jelet' " diff --git a/sql/slave.cc b/sql/slave.cc index 67d78dbff8718..bb567969ad7f0 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1346,7 +1346,7 @@ static bool sql_slave_killed(rpl_group_info *rgi) /* The transaction should always be binlogged if OPTION_BINLOG_THIS_TRX is set (it implies that something can not be rolled back). And such - case should be regarded similarly as modifing a + case should be regarded similarly as modifying a non-transactional table because retrying of the transaction will lead to an error or inconsistency as well. diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 8b56dbf5acecd..b7c4f4b9c77e4 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -8769,7 +8769,7 @@ bool check_grant_column(THD *thd, GRANT_INFO *grant, reference where the column is checked. The function provides a generic interface to check column access rights that hides the heterogeneity of the column representation - whether it is a view - or a stored table colum. + or a stored table column. RETURN FALSE OK diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 98a19e2cd83ac..d0ce2ae71e766 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3248,7 +3248,7 @@ static bool open_table_entry_fini(THD *thd, TABLE_SHARE *share, TABLE *entry) /* If we are here, there was no fatal error (but error may be still - unitialized). + uninitialized). */ if (unlikely(entry->file->implicit_emptied)) { @@ -8061,8 +8061,8 @@ bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array, /* Following 2 conditions always should be true (but they were added due to an error present only in 10.3): - 1) nest_level shoud be 0 or positive; - 2) nest level of all SELECTs on the same level shoud be equal to first + 1) nest_level should be 0 or positive; + 2) nest level of all SELECTs on the same level should be equal to first SELECT on this level (and each other). */ DBUG_ASSERT(lex->current_select->nest_level >= 0); @@ -9594,7 +9594,7 @@ bool is_equal(const LEX_CSTRING *a, const LEX_CSTRING *b) NOTES Caller should have used start_new_trans object to start a new - transcation when reading system tables. + transaction when reading system tables. Thanks to restrictions which we put on opening and locking of system tables for writing, we can open and lock them for reading diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 5bc714266bdca..fb87ad9fa86dd 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -6282,7 +6282,7 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup) } /* - Store slow query state at start of a stored procedure statment + Store slow query state at start of a stored procedure statement */ void THD::store_slow_query_state(Sub_statement_state *backup) @@ -6607,7 +6607,7 @@ void THD::mark_transaction_to_rollback(bool all) /** - Commit the whole transaction (both statment and all) + Commit the whole transaction (both statement and all) This is used mainly to commit an independent transaction, like reading system tables. diff --git a/sql/sql_class.h b/sql/sql_class.h index 5f4732db6a1c8..b9cce9b9875d7 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3116,7 +3116,7 @@ class THD: public THD_count, /* this must be first */ #endif Query_cache_tls query_cache_tls; NET net; // client connection descriptor - /** Aditional network instrumentation for the server only. */ + /** Additional network instrumentation for the server only. */ NET_SERVER m_net_server_extension; scheduler_functions *scheduler; // Scheduler for this connection Protocol *protocol; // Current protocol @@ -4982,7 +4982,7 @@ class THD: public THD_count, /* this must be first */ /* Mark thread to be killed, with optional error number and string. - string is not released, so it has to be allocted on thd mem_root + string is not released, so it has to be allocated on thd mem_root or be a global string Ensure that we don't replace a kill with a lesser one. For example diff --git a/sql/sql_const.h b/sql/sql_const.h index d0f99016bc92d..7c1afcd7eecc2 100644 --- a/sql/sql_const.h +++ b/sql/sql_const.h @@ -29,7 +29,7 @@ /* extra 4+4 bytes for slave tmp tables */ #define MAX_DBKEY_LENGTH (NAME_LEN*2+1+1+4+4) #define MAX_ALIAS_NAME 256 -#define MAX_FIELD_NAME (NAME_LEN+1) /* Max colum name length +1 */ +#define MAX_FIELD_NAME (NAME_LEN+1) /* Max column name length +1 */ #define MAX_SYS_VAR_LENGTH 32 #define MAX_KEY MAX_INDEXES /* Max used keys */ #define MAX_REF_PARTS 32 /* Max parts used as ref */ @@ -211,7 +211,7 @@ /* The lower bound of accepted rows when using filter. - This is used to ensure that filters are not too agressive. + This is used to ensure that filters are not too aggressive. */ #define MIN_ROWS_AFTER_FILTERING 1.0 diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 72f90e51762c4..13625728cc96a 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -9215,7 +9215,7 @@ void unsafe_mixed_statement(LEX::enum_stmt_accessed_table a, which means that both conditions need to be satisfied or any of them is enough. For example, - . BINLOG_DIRECT_ON & TRX_CACHE_NOT_EMPTY means that the statment is + . BINLOG_DIRECT_ON & TRX_CACHE_NOT_EMPTY means that the statement is unsafe when the option is on and trx-cache is not empty; . BINLOG_DIRECT_ON | BINLOG_DIRECT_OFF means the statement is unsafe diff --git a/sql/sql_lex.h b/sql/sql_lex.h index ae66a8b7c90f8..1247442680116 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -949,7 +949,7 @@ Field_pair *find_matching_field_pair(Item *item, List pair_list); #define UNIT_NEST_FL 1 /* - SELECT_LEX - store information of parsed SELECT statment + SELECT_LEX - store information of parsed SELECT statement */ class st_select_lex: public st_select_lex_node { @@ -3296,7 +3296,7 @@ struct LEX: public Query_tables_list /* The following is used by KILL */ killed_state kill_signal; killed_type kill_type; - uint current_select_number; // valid for statment LEX (not view) + uint current_select_number; // valid for statement LEX (not view) /* The following bool variables should not be bit fields as they are not diff --git a/sql/sql_lifo_buffer.h b/sql/sql_lifo_buffer.h index afe47b5f4154e..44b6517511681 100644 --- a/sql/sql_lifo_buffer.h +++ b/sql/sql_lifo_buffer.h @@ -31,7 +31,7 @@ class Backward_lifo_buffer; - The buffer contains fixed-size elements. The elements are either atomic byte sequences or pairs of them. - The buffer resides in the memory provided by the user. It is possible to - = dynamically (ie. between write operations) add ajacent memory space to + = dynamically (ie. between write operations) add adjacent memory space to the buffer = dynamically remove unused space from the buffer. The intent of this is to allow to have two buffers on adjacent memory diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a1fa5b28ee9ee..22b60ac97c034 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2183,7 +2183,7 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD * /* Initialize thd->lex since it's used in many base functions, such as - open_tables(). Otherwise, it remains unitialized and may cause crash + open_tables(). Otherwise, it remains uninitialized and may cause crash during execution of COM_REFRESH. */ lex_start(thd); @@ -3629,7 +3629,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) } /* - Check if statment should be skipped because of slave filtering + Check if statement should be skipped because of slave filtering rules Exceptions are: @@ -5948,7 +5948,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) INSERT INTO t1 VALUES (_utf8mb3'test'); COMMIT; - The statment (INSERT in this example) is already in binlog at this point, and the + The statement (INSERT in this example) is already in binlog at this point, and the and the "SET character_set_collations" is written inside a Q_CHARACTER_SET_COLLATIONS chunk in its log entry header. The flag CHARACTER_SET_COLLATIONS_USED is not needed any more. diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index d7ca573606596..a13fd65458561 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -64,7 +64,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent, /* Avoid problems with a rename on a table that we have locked or - if the user is trying to to do this in a transcation context + if the user is trying to do this in a transaction context */ if (thd->locked_tables_mode || thd->in_active_multi_stmt_transaction()) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index fb00d2f248023..fd2053e2a4af2 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -909,7 +909,7 @@ void remove_redundant_subquery_clauses(st_select_lex *subq_select_lex) } /* - TODO: This would prevent processing quries with ORDER BY ... LIMIT + TODO: This would prevent processing queries with ORDER BY ... LIMIT therefore we disable this optimization for now. Remove GROUP BY if there are no aggregate functions and no HAVING clause diff --git a/sql/sql_select.h b/sql/sql_select.h index f2e634edcfb21..7b1700b8293a7 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1166,7 +1166,7 @@ class Pushdown_query; @details The result records are obtained on the put_record() call. - The aggrgation process is determined by the write_func, it could be: + The aggregation process is determined by the write_func, it could be: end_write Simply store all records in tmp table. end_write_group Perform grouping using join->group_fields, records are expected to be sorted. @@ -1375,7 +1375,7 @@ class JOIN :public Sql_alloc /* Tables one is allowed to use in choose_plan(). Either all or - set to a mapt of the tables in the materialized semi-join nest + set to a map of the tables in the materialized semi-join nest */ table_map allowed_tables; diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 317463666bfde..9dbe874cd8a09 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5827,7 +5827,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, { /* Get pointer to the newly opened table. We need this to ensure we - don't reopen the table when doing statment logging below. + don't reopen the table when doing statement logging below. */ table->table= pos_in_locked_tables->table; table->table->mdl_ticket->downgrade_lock(MDL_SHARED_NO_READ_WRITE); diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index 90056b40fb708..f8849d3e41c2e 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -270,7 +270,7 @@ Sql_cmd_truncate_table::handler_truncate(THD *thd, TABLE_LIST *table_ref, /* If truncate method is not implemented then we don't binlog the statement. If truncation has failed in a transactional engine then also - we don't binlog the statment. Only in non transactional engine we binlog + we don't binlog the statement. Only in non transactional engine we binlog inspite of errors. */ if (error == HA_ERR_WRONG_COMMAND || diff --git a/sql/sql_type.h b/sql/sql_type.h index d779eeb7b0e7b..1025eee37b453 100644 --- a/sql/sql_type.h +++ b/sql/sql_type.h @@ -853,7 +853,7 @@ class VSec9: protected Sec9 /* - A heler class to perform additive operations between + A helper class to perform additive operations between two MYSQL_TIME structures and return the result as a combination of seconds, microseconds and sign. */ diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index dc1c33c43ea7d..5d094500f17a4 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1199,7 +1199,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %left PREC_BELOW_NOT -/* The precendence of boolean NOT is in fact here. See the comment below. */ +/* The precedence of boolean NOT is in fact here. See the comment below. */ %left '=' EQUAL_SYM GE '>' LE '<' NE %nonassoc IS @@ -1253,7 +1253,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); - SYSTEM: identifier, system versioning: SELECT system FROM t1; - ALTER TABLE DROP SYSTEM VERSIONIONG; + ALTER TABLE DROP SYSTEM VERSIONING; - USER: identifier, user: SELECT user FROM t1; @@ -5879,7 +5879,7 @@ create_table_option: Lex->create_info.used_fields|= HA_CREATE_USED_INDEXDIR; } | TABLESPACE ident - { /* Compatiblity with MySQL */ } + { /* Compatibility with MySQL */ } | STORAGE_SYM DISK_SYM {Lex->create_info.storage_media= HA_SM_DISK;} | STORAGE_SYM MEMORY_SYM @@ -7447,7 +7447,7 @@ alter: { if (likely(!Lex->m_sql_cmd)) { - /* Create a generic ALTER TABLE statment. */ + /* Create a generic ALTER TABLE statement. */ Lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_alter_table(); if (unlikely(Lex->m_sql_cmd == NULL)) MYSQL_YYABORT; @@ -7534,7 +7534,7 @@ alter: MYSQL_YYABORT; /* It is safe to use Lex->spname because - ALTER EVENT xxx RENATE TO yyy DO ALTER EVENT RENAME TO + ALTER EVENT xxx RENAME TO yyy DO ALTER EVENT RENAME TO is not allowed. Lex->spname is used in the case of RENAME TO If it had to be supported spname had to be added to Event_parse_data. @@ -7601,7 +7601,7 @@ alter: } sequence_defs { - /* Create a generic ALTER SEQUENCE statment. */ + /* Create a generic ALTER SEQUENCE statement. */ Lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_alter_sequence($3); if ((Lex->create_info.seq_create_info->used_fields & seq_field_used_as) && @@ -10158,7 +10158,7 @@ trim_operands_special: - the collation of the column `a`, or - the collation of the string literal 'a' - This restriction allows to parse the above query unambiguiusly: + This restriction allows to parse the above query unambiguously: COLLATE belongs to the column rather than the literal. If one needs COLLATE to belong to the literal, parentheses must be used: CREATE TABLE t1 (a TEXT DEFAULT ('a' COLLATE latin1_bin)); @@ -13242,7 +13242,7 @@ procedure_clause: /* PROCEDURE CLAUSE cannot handle subquery as one of its parameter, so disallow any subqueries further. - Alow subqueries back once the parameters are reduced. + Allow subqueries back once the parameters are reduced. */ Lex->clause_that_disallows_subselect= "PROCEDURE"; Select->options|= OPTION_PROCEDURE_CLAUSE; @@ -14656,7 +14656,7 @@ show_param: } | describe_command opt_format_json FOR_SYM expr /* - The alternaltive syntax for this command is MySQL-compatible + The alternative syntax for this command is MySQL-compatible EXPLAIN FOR CONNECTION */ { @@ -16300,7 +16300,7 @@ keyword_sp_var_not_label: In case if heavy grammar conflicts are found in the future, we'll possibly need to make them reserved for sql_mode=ORACLE. - TODO: Allow these variables as SP lables when sql_mode=ORACLE. + TODO: Allow these variables as SP labels when sql_mode=ORACLE. TODO: Allow assigning of "SP characteristics" marked variables inside compound blocks. TODO: Allow "follows" and "precedes" as variables in compound blocks: @@ -19711,7 +19711,7 @@ package_implementation_declare_section: { /* Add a jump "end of declarations -> start of exceptions" - (over the executable sectition). + (over the executable section). */ if (Lex->sp_block_with_exceptions_finalize_declarations(thd)) MYSQL_YYABORT; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index c5147c62f5a5e..e41a825d9254f 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -5121,7 +5121,7 @@ static Sys_var_session_special Sys_identity( We want statements referring explicitly to @@session.insert_id to be unsafe, because insert_id is modified internally by the slave sql thread when NULL values are inserted in an AUTO_INCREMENT column. - This modification interfers with the value of the + This modification interferes with the value of the @@session.insert_id variable if @@session.insert_id is referred explicitly by an insert statement (as is seen by executing "SET @@session.insert_id=0; CREATE TABLE t (a INT, b INT KEY diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc index 1dd309588833f..04e652ba1f880 100644 --- a/sql/threadpool_common.cc +++ b/sql/threadpool_common.cc @@ -420,7 +420,7 @@ static dispatch_command_return threadpool_process_request(THD *thd) /* In the loop below, the flow is essentially the copy of - thead-per-connections + thread-per-connections logic, see do_handle_one_connection() in sql_connect.c The goal is to execute a single query, thus the loop is normally executed diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 3ff3121810b21..ea1758e26ff99 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -326,7 +326,7 @@ static MYSQL_THDVAR_BOOL(cond_push, PLUGIN_VAR_RQCMDARG, Temporary file usage: no: Not using temporary file auto: Using temporary file when needed - yes: Allways using temporary file + yes: Always using temporary file force: Force using temporary file (no MAP) test: Reserved */ diff --git a/storage/connect/plgdbsem.h b/storage/connect/plgdbsem.h index 4b70915426287..11a763fa941b9 100644 --- a/storage/connect/plgdbsem.h +++ b/storage/connect/plgdbsem.h @@ -486,7 +486,7 @@ typedef struct _format { /* Format descriptor block */ /***********************************************************************/ typedef struct _tabptr { /* start=P1 */ struct _tabptr *Next; - int Num; /* alignement */ + int Num; /* alignment */ void *Old[50]; void *New[50]; /* old and new values of copied ptrs */ } TABPTR, *PTABPTR; diff --git a/storage/connect/xindex.cpp b/storage/connect/xindex.cpp index 471339a712660..f90c595dc7a53 100644 --- a/storage/connect/xindex.cpp +++ b/storage/connect/xindex.cpp @@ -126,7 +126,7 @@ INDEXDEF::INDEXDEF(char *name, bool uniq, int n) } // end of INDEXDEF constructor /***********************************************************************/ -/* Set the max same values for each colum after making the index. */ +/* Set the max same values for each column after making the index. */ /***********************************************************************/ void INDEXDEF::SetMxsame(PXINDEX x) { diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index af2acf31a689a..7e208cc150d52 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -1189,7 +1189,7 @@ int ha_tina::init_data_file() ha_tina::info ha_tina::rnd_init ha_tina::extra - ENUM HA_EXTRA_CACHE Cash record in HA_rrnd() + ENUM HA_EXTRA_CACHE Cache record in HA_rrnd() ha_tina::rnd_next ha_tina::rnd_next ha_tina::rnd_next diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index b842308075357..2d1b9cb328ea3 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -2388,7 +2388,7 @@ int ha_federated::index_read(uchar *buf, const uchar *key, NOTES This uses an internal result set that is deleted before function - returns. We need to be able to be calable from ha_rnd_pos() + returns. We need to be able to be callable from ha_rnd_pos() */ int ha_federated::index_read_idx(uchar *buf, uint index, const uchar *key, diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index cf8cb2c241b36..d3ece2f8b5811 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -2515,7 +2515,7 @@ struct dict_table_t { columns; protected by lock_latch */ dict_vcol_templ_t *vc_templ; - /* @return whether the table has any other transcation lock + /* @return whether the table has any other transaction lock other than the given transaction */ bool has_lock_other_than(const trx_t *trx) const { diff --git a/storage/innobase/include/lock0prdt.h b/storage/innobase/include/lock0prdt.h index db8e33922c431..6803ff8f36a55 100644 --- a/storage/innobase/include/lock0prdt.h +++ b/storage/innobase/include/lock0prdt.h @@ -109,7 +109,7 @@ lock_prdt_update_split( const page_id_t page_id); /*!< in: page number */ /**************************************************************//** -Ajust locks from an ancester page of Rtree on the appropriate level . */ +Adjust locks from an ancestor page of Rtree on the appropriate level . */ void lock_prdt_update_parent( /*====================*/ diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h index b6e0751015c8f..a32c070a16e45 100644 --- a/storage/innobase/include/trx0purge.h +++ b/storage/innobase/include/trx0purge.h @@ -265,7 +265,7 @@ class purge_sys_t return purge_queue.clone_container(); } - /** Acquare purge_queue_mutex */ + /** Acquire purge_queue_mutex */ void queue_lock() { mysql_mutex_lock(&pq_mutex); } /** Release purge queue mutex */ diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 490f71653f70b..3d11dd5e81102 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -260,7 +260,7 @@ database name and table name. In addition, 14 bytes is added for: #define MAX_FULL_NAME_LEN \ (MAX_TABLE_NAME_LEN + MAX_DATABASE_NAME_LEN + 14) -/** Maximum length of the compression alogrithm string. Currently we support +/** Maximum length of the compression algorithm string. Currently we support only (NONE | ZLIB | LZ4). */ #define MAX_COMPRESSION_LEN 4 diff --git a/storage/maria/aria_chk.c b/storage/maria/aria_chk.c index 0ebbc0d6ef55d..1b6c7020902ed 100644 --- a/storage/maria/aria_chk.c +++ b/storage/maria/aria_chk.c @@ -517,7 +517,7 @@ static void usage(void) puts("Check options (check is the default action for aria_chk):\n\ -c, --check Check table for errors.\n\ - -e, --extend-check Check the table VERY throughly. Only use this in\n\ + -e, --extend-check Check the table VERY thoroughly. Only use this in\n\ extreme cases as aria_chk should normally be able to\n\ find out if the table is ok even without this switch.\n\ -F, --fast Check only tables that haven't been closed properly.\n\ diff --git a/storage/maria/aria_dump_log.c b/storage/maria/aria_dump_log.c index ac7dc60fc9b19..64928edb22375 100644 --- a/storage/maria/aria_dump_log.c +++ b/storage/maria/aria_dump_log.c @@ -35,7 +35,7 @@ static File handler= -1; static my_bool opt_unit= 0; static struct my_option my_long_options[] = { -#ifdef IMPLTMENTED +#ifdef IMPLEMENTED {"body", 'b', "Print chunk body dump", (uchar **) &opt_body, (uchar **) &opt_body, 0, diff --git a/storage/maria/aria_pack.c b/storage/maria/aria_pack.c index c17be37e03b1c..98761cdaa837b 100644 --- a/storage/maria/aria_pack.c +++ b/storage/maria/aria_pack.c @@ -523,7 +523,7 @@ static MARIA_HA *open_maria_file(char *name,int mode) } if (verbose) puts("Recompressing already compressed table"); - share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifing it */ + share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifying it */ } if (! force_pack && share->state.state.records != 0 && (share->state.state.records <= 1 || @@ -1497,7 +1497,7 @@ test_space_compress(HUFF_COUNTS *huff_counts, my_off_t records, min_pos= -2; huff_counts->counts[(uint) ' ']=space_count; - /* Test with allways space-count */ + /* Test with always space-count */ new_length=huff_counts->bytes_packed+length_bits*records/8; if (new_length+1 < min_pack) { diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index 1a8de445264e0..f8da9ad324007 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_check.c @@ -6327,7 +6327,7 @@ int maria_recreate_table(HA_CHECK *param, MARIA_HA **org_info, char *filename) "indexfile", my_errno); goto end; } - /* We are modifing */ + /* We are modifying */ (*org_info)->s->options&= ~HA_OPTION_READ_ONLY_DATA; _ma_readinfo(*org_info,F_WRLCK,0); (*org_info)->s->state.state.records= info.state->records; diff --git a/storage/maria/ma_delete.c b/storage/maria/ma_delete.c index 349da9f904f7c..11f0d3d3d051b 100644 --- a/storage/maria/ma_delete.c +++ b/storage/maria/ma_delete.c @@ -764,7 +764,7 @@ static int del(MARIA_HA *info, MARIA_KEY *key, leaf_page is saved to disk Caller must save anc_buff - For the algoritm to work, we have to ensure for packed keys that + For the algorithm to work, we have to ensure for packed keys that key_length + (underflow_length + max_block_length + key_length) / 2 <= block_length. From which follows that underflow_length <= block_length - key_length *3 diff --git a/storage/maria/ma_ft_test1.h b/storage/maria/ma_ft_test1.h index df86eeceb66c9..cd16036d3c8f0 100644 --- a/storage/maria/ma_ft_test1.h +++ b/storage/maria/ma_ft_test1.h @@ -220,7 +220,7 @@ struct { const char *f0, *f2; } data[NDATAS] = { {"11.12", "What are the different row formats? Or, when should VARCHAR/CHAR be used?"}, {"11.13", "Why so many open tables?"}, {"12", "MySQL benchmark suite"}, - {"13", "MySQL Utilites"}, + {"13", "MySQL Utilities"}, {"13.1", "Overview of the different MySQL programs"}, {"13.2", "The MySQL table check, optimize and repair program"}, {"13.2.1", "isamchk memory use"}, diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index b76f9020e2f0d..c31bff702e709 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -6503,7 +6503,7 @@ my_bool translog_write_record(LSN *lsn, for (i= TRANSLOG_INTERNAL_PARTS; i < part_no; i++) { #ifdef HAVE_valgrind - /* Find unitialized bytes early */ + /* Find uninitialized bytes early */ checksum+= my_checksum(checksum, parts_data[i].str, parts_data[i].length); #endif diff --git a/storage/maria/ma_statrec.c b/storage/maria/ma_statrec.c index ff0c6c7a61721..c4c12eba3957e 100644 --- a/storage/maria/ma_statrec.c +++ b/storage/maria/ma_statrec.c @@ -53,7 +53,7 @@ my_bool _ma_write_static_record(MARIA_HA *info, const uchar *record) return(2); if (info->opt_flag & WRITE_CACHE_USED) - { /* Cash in use */ + { /* Caсhe in use */ if (my_b_write(&info->rec_cache, record, info->s->base.reclength)) goto err; diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index 7994a40ecac1b..e76f1f91bbaa9 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -589,7 +589,7 @@ my_bool _ma_enlarge_root(MARIA_HA *info, MARIA_KEY *key, my_off_t *root) page_store_info(share, &page); /* - Clear unitialized part of page to avoid valgrind/purify warnings + Clear uninitialized part of page to avoid valgrind/purify warnings and to get a clean page that is easier to compress and compare with pages generated with redo */ @@ -1078,7 +1078,7 @@ int _ma_split_page(MARIA_HA *info, MARIA_KEY *key, MARIA_PAGE *split_page, res= -1; /* - Clear unitialized part of page to avoid valgrind/purify warnings + Clear uninitialized part of page to avoid valgrind/purify warnings and to get a clean page that is easier to compress and compare with pages generated with redo */ diff --git a/storage/maria/test_aria_s3_copy.sh b/storage/maria/test_aria_s3_copy.sh index ad39df69de270..116acd2a143c7 100755 --- a/storage/maria/test_aria_s3_copy.sh +++ b/storage/maria/test_aria_s3_copy.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# Note that this test expact that there are tables test1 and test2 in +# Note that this test expect that there are tables test1 and test2 in # the current directory where test2 has also a .frm file # diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index 966b19096b8aa..d81814069bc3d 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -2342,7 +2342,7 @@ static ulonglong mrn_generic_ft_ext_get_flags() { MRN_DBUG_ENTER_FUNCTION(); // TODO: Should we support FTS_ORDERED_RESULT? - // TODO: Shuold we support FTS_DOCID_IN_RESULT? + // TODO: Should we support FTS_DOCID_IN_RESULT? ulonglong flags = 0; DBUG_RETURN(flags); } diff --git a/storage/mroonga/vendor/groonga/configure.ac b/storage/mroonga/vendor/groonga/configure.ac index cab122ad3a51f..2d721aac26f4c 100644 --- a/storage/mroonga/vendor/groonga/configure.ac +++ b/storage/mroonga/vendor/groonga/configure.ac @@ -586,7 +586,7 @@ AC_MSG_RESULT([$enable_memory_debug]) if test "x$enable_memory_debug" = "xyes"; then AC_DEFINE(USE_MEMORY_DEBUG, [1], - [Define to 1 if you enable debuging memory management]) + [Define to 1 if you enable debugging memory management]) fi # epoll/kqueue/poll/select check @@ -736,7 +736,7 @@ else AC_MSG_RESULT($ac_benchmark_available) fi if test "$benchmark_available" = "yes"; then - AC_DEFINE(GRN_WITH_BENCHMARK, 1, [Define to 1 if benchamrk is available]) + AC_DEFINE(GRN_WITH_BENCHMARK, 1, [Define to 1 if benchmark is available]) fi AM_CONDITIONAL([WITH_BENCHMARK], [test "$benchmark_available" = "yes"]) diff --git a/storage/mroonga/vendor/groonga/lib/grn_ecmascript.c b/storage/mroonga/vendor/groonga/lib/grn_ecmascript.c index cfabcc9196b42..28010d465e120 100644 --- a/storage/mroonga/vendor/groonga/lib/grn_ecmascript.c +++ b/storage/mroonga/vendor/groonga/lib/grn_ecmascript.c @@ -13,7 +13,7 @@ ** ** The "lemon" program processes an LALR(1) input grammar file, then uses ** this template to construct a parser. The "lemon" program inserts text -** at each "%%" line. Also, any "P-a-r-s-e" identifer prefix (without the +** at each "%%" line. Also, any "P-a-r-s-e" identifier prefix (without the ** interstitial "-" characters) contained in this template is changed into ** the value of the %name directive from the grammar. Otherwise, the content ** of this template is copied straight through into the generate parser diff --git a/storage/mroonga/vendor/groonga/lib/snip.c b/storage/mroonga/vendor/groonga/lib/snip.c index 4693dc2b5f31c..a98b6c3c9727a 100644 --- a/storage/mroonga/vendor/groonga/lib/snip.c +++ b/storage/mroonga/vendor/groonga/lib/snip.c @@ -636,7 +636,7 @@ grn_snip_exec(grn_ctx *ctx, grn_obj *snip, const char *string, unsigned int stri if (!cond) { break; } - /* check whether condtion is the first condition in snippet */ + /* check whether condition is the first condition in snippet */ if (snip_result->tag_count == 0) { /* skip condition if the number of rest snippet field is smaller than */ /* the number of unfound keywords. */ diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/README.md b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/README.md index fae74b6ce13b9..e970b360cb66a 100644 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/README.md +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/README.md @@ -36,7 +36,7 @@ are true for doesn't normalize `ぁ` to `あ` nor `っ` to `つ`. `ぁ` and `あ` are different characters. `っ` and `つ` are also different characters. This behavior is described by `ExceptKanaCI` in the long name. This - following behaviors ared described by + following behaviors are described by `ExceptKanaWithVoicedSoundMark` in the long name. * `NormalizerMySQLUnicode` normalizes all Hiragana with voiced sound mark such as `が` to Hiragana without voiced sound mark such as `か`. diff --git a/storage/myisam/ChangeLog b/storage/myisam/ChangeLog index 504202be43f49..5facc83447e64 100644 --- a/storage/myisam/ChangeLog +++ b/storage/myisam/ChangeLog @@ -8,7 +8,7 @@ 2000-08-17 Michael Widenius -* Add a new flag in share.staus so that we can quickly check if a table +* Add a new flag in share.status so that we can quickly check if a table is analyzed or not! 2000-07-02 Michael Widenius @@ -135,7 +135,7 @@ Mon Aug 2 13:54:35 1999 Michael Widenius 1999-02-06 Michael Widenius -* Keys, key pointers and all varibles in the index file are stored in +* Keys, key pointers and all variables in the index file are stored in high-endian-order to get better compression. * Allow NULL on keys diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 1d9f00a8c7456..6a99edc948120 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -4397,7 +4397,7 @@ int recreate_table(HA_CHECK *param, MI_INFO **org_info, char *filename) my_errno); goto end; } - /* We are modifing */ + /* We are modifying */ (*org_info)->s->options&= ~HA_OPTION_READ_ONLY_DATA; (void) _mi_readinfo(*org_info,F_WRLCK,0); (*org_info)->state->records=info.state->records; diff --git a/storage/myisam/mi_statrec.c b/storage/myisam/mi_statrec.c index 363c9707a4b71..4e11b1eb9686d 100644 --- a/storage/myisam/mi_statrec.c +++ b/storage/myisam/mi_statrec.c @@ -47,7 +47,7 @@ int _mi_write_static_record(MI_INFO *info, const uchar *record) return(2); } if (info->opt_flag & WRITE_CACHE_USED) - { /* Cash in use */ + { /* Cache in use */ if (my_b_write(&info->rec_cache, record, info->s->base.reclength)) goto err; diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 1a34bb8560291..d86edf243b9d7 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -861,7 +861,7 @@ static int myisamchk(HA_CHECK *param, char * filename) DBUG_RETURN(1); } share=info->s; - share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifing it */ + share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifying it */ share->tot_locks-= share->r_locks; share->r_locks=0; diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 0afaa48fc3db9..37068f8c8d362 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -410,7 +410,7 @@ static MI_INFO *open_isam_file(char *name,int mode) } if (verbose) puts("Recompressing already compressed table"); - share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifing it */ + share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifying it */ /* We want to use the new checksums if we have null fields */ if (share->has_null_fields) @@ -1417,7 +1417,7 @@ test_space_compress(HUFF_COUNTS *huff_counts, my_off_t records, min_pos= -2; huff_counts->counts[(uint) ' ']=space_count; - /* Test with allways space-count */ + /* Test with always space-count */ new_length=huff_counts->bytes_packed+length_bits*records/8; if (new_length+1 < min_pack) { diff --git a/storage/perfschema/pfs_column_types.h b/storage/perfschema/pfs_column_types.h index 862916fa4fc77..88efd4f873676 100644 --- a/storage/perfschema/pfs_column_types.h +++ b/storage/perfschema/pfs_column_types.h @@ -308,7 +308,7 @@ enum enum_isolation_level #define COUNT_TRANS_LEVEL (LAST_TRANS_LEVEL - FIRST_TRANS_LEVEL + 1) /** - Enum values for transaction acces mode columns. + Enum values for transaction access mode columns. */ enum enum_transaction_mode { diff --git a/storage/perfschema/table_replication_connection_configuration.cc b/storage/perfschema/table_replication_connection_configuration.cc index 9dbd35838fdd8..9d49de76c4279 100644 --- a/storage/perfschema/table_replication_connection_configuration.cc +++ b/storage/perfschema/table_replication_connection_configuration.cc @@ -68,7 +68,7 @@ table_replication_connection_configuration::m_share= "SSL_CA_FILE VARCHAR(512) not null comment 'Path to the file that contains one or more certificates for trusted Certificate Authorities (CA) to use for TLS.'," "SSL_CA_PATH VARCHAR(512) not null comment 'Path to a directory that contains one or more PEM files that contain X509 certificates for a trusted Certificate Authority (CA) to use for TLS.'," "SSL_CERTIFICATE VARCHAR(512) not null comment 'Path to the certificate used to authenticate the master.'," - "SSL_CIPHER VARCHAR(512) not null comment 'Which cipher is used for encription.'," + "SSL_CIPHER VARCHAR(512) not null comment 'Which cipher is used for encryption.'," "SSL_KEY VARCHAR(512) not null comment 'Path to the private key used for TLS.'," "SSL_VERIFY_SERVER_CERTIFICATE ENUM('YES','NO') not null comment 'Whether the server certificate is verified as part of the SSL connection'," "SSL_CRL_FILE VARCHAR(255) not null comment 'Path to the PEM file containing one or more revoked X.509 certificates.'," diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index fcf07423e63c8..aa86d5a65727f 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -8262,7 +8262,7 @@ int ha_rocksdb::read_row_from_secondary_key(uchar *const buf, keyparts whose datatype is not yet known. We walk around this problem by using check_keyread_allowed(), which uses - table_share object and is careful not to step on unitialized data. + table_share object and is careful not to step on uninitialized data. When we get a call with all_parts=TRUE, we try to analyze all parts but ignore those that have key_part->field==nullptr (these are not initialized diff --git a/storage/rocksdb/myrocks_hotbackup.py b/storage/rocksdb/myrocks_hotbackup.py index 42c25c95c1c0d..0ccf9e0562be3 100755 --- a/storage/rocksdb/myrocks_hotbackup.py +++ b/storage/rocksdb/myrocks_hotbackup.py @@ -88,7 +88,7 @@ def check_frm_timestamp(self, fname, path): logger.error('FRM file %s was updated after starting backups. ' 'Schema could have changed and the resulting copy may ' 'not be valid. Aborting. ' - '(backup time: %s, file modifled time: %s)', + '(backup time: %s, file modified time: %s)', path, datetime.datetime.fromtimestamp(self.start_backup_time).strftime('%Y-%m-%d %H:%M:%S'), datetime.datetime.fromtimestamp(os.path.getmtime(path)).strftime('%Y-%m-%d %H:%M:%S')) raise Exception("Inconsistent frm file timestamp"); diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 5973745867677..747d808a26cb0 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -798,7 +798,7 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs, return (~(ulonglong) 0); } - /* Avoid undefinite behavior - negation of LONGLONG_MIN */ + /* Avoid undefined behavior - negation of LONGLONG_MIN */ return negative && (longlong) i != LONGLONG_MIN ? -((longlong) i) : (longlong) i; diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index 7a4d6db339971..fa356b59e28f4 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -602,7 +602,7 @@ my_strntoull_mb2_or_mb4(CHARSET_INFO *cs, return (~(ulonglong) 0); } - /* Avoid undefinite behavior - negation of LONGLONG_MIN */ + /* Avoid undefined behavior - negation of LONGLONG_MIN */ return negative && (longlong) res != LONGLONG_MIN ? -((longlong) res) : (longlong) res; @@ -1056,7 +1056,7 @@ my_strtoll10_mb2(CHARSET_INFO *cs __attribute__((unused)), { if (li > MAX_NEGATIVE_NUMBER) goto overflow; - if (li == MAX_NEGATIVE_NUMBER) // Avoid undefinite behavior in negation + if (li == MAX_NEGATIVE_NUMBER) // Avoid undefined behavior in negation return LONGLONG_MIN; return -((longlong) li); } @@ -2537,7 +2537,7 @@ my_strtoll10_utf32(CHARSET_INFO *cs __attribute__((unused)), { if (li > MAX_NEGATIVE_NUMBER) goto overflow; - if (li == MAX_NEGATIVE_NUMBER) // Avoid undefinite behavior in negation + if (li == MAX_NEGATIVE_NUMBER) // Avoid undefined behavior in negation return LONGLONG_MIN; return -((longlong) li); } diff --git a/strings/string.doc b/strings/string.doc index 09572c968d4b2..f5ac401a665d0 100644 --- a/strings/string.doc +++ b/strings/string.doc @@ -29,7 +29,7 @@ Speciella anv unsigned is what you generally want. m_ctype.h - A better inplementation of the UNIX ctype(3) library. + A better implementation of the UNIX ctype(3) library. Notes: global.h should be included before ctype.h - Se efter i filen \c\local\include\m_ctype.h - Anvnds istllet fr ctype.h fr att klara internationella karakterer. @@ -45,7 +45,7 @@ Speciella anv strappend(dest, len, fill) appends fill-characters to a string so that the result length == len. If the string is longer than len it's - trunked. The des+len character is allways set to NULL. + trunked. The des+len character is always set to NULL. strcat(s, t) concatenates t on the end of s. There had better be enough room in the space s points to; strcat has no way to tell. @@ -69,7 +69,7 @@ Speciella anv the end of strings. It is redundant, because strchr(s,'\0') could strfill(dest, len, fill) makes a string of fill-characters. The result - string is of length == len. The des+len character is allways set to NULL. + string is of length == len. The des+len character is always set to NULL. strfill() returns pointer to dest+len; strfind(src, pat) looks for an instance of pat in src. pat is not a diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index b1ad009af0868..7f44a48fdb9e9 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -163,7 +163,7 @@ .*/pcre/pcre_exec\.c: noclone.*attribute directive ignored # -# Unexplanable (?) stuff +# Unexplainable (?) stuff # .*/listener\.cc : .*conversion from 'SOCKET' to 'int'.* .*/net_serv\.cc : .*conversion from 'SOCKET' to 'int'.* diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in index 8fda6acbd1a7a..3fab4cda687d4 100644 --- a/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in @@ -207,7 +207,7 @@ ExecStartPre=@scriptdir@/mysql_install_db $MYSQLD_MULTI_INSTANCE # Start main service # A few variables are here: -# * MYSQLD_MULTI_INSTANCE - control how multiple instances are distinguisable +# * MYSQLD_MULTI_INSTANCE - control how multiple instances are distinguishable # * MYSQLD_OPTS - user definable extras - not a replacement for my.cnf # # Note 1: Place $MYSQLD_OPTS at the very end for its options to take precedence. diff --git a/support-files/policy/selinux/README b/support-files/policy/selinux/README index 3f695dc27a3aa..f1a247c710119 100644 --- a/support-files/policy/selinux/README +++ b/support-files/policy/selinux/README @@ -16,5 +16,5 @@ How to generate and load the policy module of MariaDB Galera cluster ? # semanage port -a -t mysqld_port_t -p tcp 4568 # semanage port -a -t mysqld_port_t -p udp 4567 -How to run mysqld in permissve mode ? +How to run mysqld in permissive mode ? # semanage permissive -a mysqld_t diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh index 7242fff9f7ac0..c7b71727054e3 100644 --- a/support-files/wsrep.cnf.sh +++ b/support-files/wsrep.cnf.sh @@ -8,7 +8,7 @@ # The rest of defaults should work out of the box. ## -## mysqld options _MANDATORY_ for correct opration of the cluster +## mysqld options _MANDATORY_ for correct operation of the cluster ## [mysqld] diff --git a/support-files/wsrep_notify.sh b/support-files/wsrep_notify.sh index 4070ec920f815..19ffec958637d 100755 --- a/support-files/wsrep_notify.sh +++ b/support-files/wsrep_notify.sh @@ -1,7 +1,7 @@ #!/bin/sh -eu # This is a simple example of wsrep notification script (wsrep_notify_cmd). -# It will create 'wsrep' schema and two tables in it: 'membeship' and 'status' +# It will create 'wsrep' schema and two tables in it: 'membership' and 'status' # and fill them on every membership or node status change. # # Edit parameters below to specify the address and login to server: diff --git a/tests/check_costs.pl b/tests/check_costs.pl index a89f3d07160f6..6288b1e8a0e91 100755 --- a/tests/check_costs.pl +++ b/tests/check_costs.pl @@ -483,7 +483,7 @@ () "select sum(l_quantity) from $table where l_commitDate >= '2000-01-01' and l_quantity*l_extendedprice-l_discount+l_tax > 0.0"); } -# Calculate the time spent for table accesses (done with analyze statment) +# Calculate the time spent for table accesses (done with analyze statement) # Table scan @@ -862,7 +862,7 @@ () { # Add the cost of the where for the two tables. The last table # is assumed to have $expected_rows while the first (driving table) - # may have less rows. Take that into account when calculalting the + # may have less rows. Take that into account when calculating the # total where cost. $local_where_cost= ($local_where_cost + $local_where_cost * diff --git a/tests/upgrade_from/test_upgrade.sh b/tests/upgrade_from/test_upgrade.sh index 71a807831ce96..75bf85f13b8a2 100755 --- a/tests/upgrade_from/test_upgrade.sh +++ b/tests/upgrade_from/test_upgrade.sh @@ -114,7 +114,7 @@ install_mariadb_from_archive() { version=$1 # Find latest RPM repository from https://archive.mariadb.org/ # The RPMs for each MariaDB version are build for the latest distribution version at the time of release. - # Certain required libraries are missing in the latest version of the distribuiton this test is being run on (currently Fedora). + # Certain required libraries are missing in the latest version of the distribution this test is being run on (currently Fedora). # The missing libraries depned on the latest distribution version, so that is found by scanning the MariaDB archive directory. log "Finding MariaDB RPM repository for version $version" diff --git a/vio/docs/COPYING.openssl b/vio/docs/COPYING.openssl index b9e18d5e7bf3e..14d8bf82cd77e 100644 --- a/vio/docs/COPYING.openssl +++ b/vio/docs/COPYING.openssl @@ -76,7 +76,7 @@ * The implementation was written so as to conform with Netscapes SSL. * * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions + * the following conditions are adhered to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms diff --git a/win/create_def_file.js b/win/create_def_file.js index c8915a397bce6..2736d074eab05 100644 --- a/win/create_def_file.js +++ b/win/create_def_file.js @@ -28,7 +28,7 @@ cscript create_def_file.js [x86|x64] [object|static_lib|directory ...] If directory is passed as a parameter, script will process all object files - and static libraries in this directory and recursively in all subdrectories. + and static libraries in this directory and recursively in all subdirectories. Note :The script does not work properly if /GL (global optimization) compiler option was used to produce object files or libraries. This is a @@ -58,7 +58,7 @@ var fso = new ActiveXObject("Scripting.FileSystemObject"); If .def file is used with together with lib.exe the name mangling for stdcall is slightly different. - Undescore prefix for stdcall function name must be removed for + Underscore prefix for stdcall function name must be removed for lib.exe but not link.exe (see ScrubSymbol()) This difference is not documented anywhere and could diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake index f6ef25d5b4613..ed0314136a416 100644 --- a/win/packaging/CPackWixConfig.cmake +++ b/win/packaging/CPackWixConfig.cmake @@ -78,7 +78,7 @@ endforeach() set(CPACK_COMPONENTS_ALL ${COMPONENTS_INSTALL}) -# Extra things beyong CMake components +# Extra things beyond CMake components # DBInstance (running mysql_install_db.exe) set(WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents") diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 056a7ec43abdb..3cdd0a831e850 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -23,7 +23,7 @@ Installation parameters that can be passed via msiexec command line For "booleans" (like skip networking), just providing any value means property set to "yes". --> - +