1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix remaining typos

Browse Source
This commit is contained in:
Vasilii Lakhin 2025-04-21 18:27:56 +03:00 committed by Daniel Black
parent bc87abc381
commit 40c5b62531
135 changed files with 217 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/pull_request_template.md vendored
View File

@ -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.*
<!--
All code merged into the MariaDB codebase must meet a quality standard and codying style.
All code merged into the MariaDB codebase must meet a quality standard and coding style.
Maintainers are happy to point out inconsistencies but in order to speed up the review and merge process we ask you to check the CODING standards.
-->
## PR quality check

4
.gitlab-ci.yml
View File

@ -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

2
BUILD-CMAKE
View File

@ -242,7 +242,7 @@ is in <build-root>/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.

2
BUILD/compile-pentium64-ubsan
View File

@ -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)

2
CODING_STANDARDS.md
View File

@ -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.

2
Docs/myisam.txt
View File

@ -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)

8
Docs/optimizer_costs.txt
View File

@ -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

2
cmake/aws_sdk.cmake
View File

@ -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)

2
cmake/generate_sbom.cmake
View File

@ -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.

2
cmake/merge_archives_unix.cmake
View File

@ -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.

2
cmake/os/Windows.cmake
View File

@ -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()

2
debian/autobake-deb.sh vendored
View File

@ -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
}

2
debian/mariadb-plugin-mroonga.lintian-overrides vendored
View File

@ -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]

4
debian/mariadb-server.postinst vendored
View File

@ -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

2
debian/mariadb-test-data.lintian-overrides vendored
View File

@ -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]

2
debian/source/lintian-overrides vendored
View File

@ -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

2
extra/mariabackup/innobackupex.cc
View File

@ -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,

2
extra/replace.c
View File

@ -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)
{

2
libmysqld/examples/builder-sample/emb_sample.bpr
View File

@ -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

4
man/mariadb-check.1
View File

@ -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

2
man/mariadb-import.1
View File

@ -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

2
man/mariadb.1
View File

@ -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

12
mysql-test/main/sp.result
View File

@ -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

6
mysql-test/main/sp.test
View File

@ -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()

2
mysql-test/suite/perfschema/r/table_schema.result
View File

@ -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

18
mysys/ChangeLog
View File

@ -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;

2
mysys/my_access.c
View File

@ -20,7 +20,7 @@
#ifdef _WIN32
/*
Check a file or path for accessability.
Check a file or path for accesibility.
SYNOPSIS
file_access()

2
mysys/psi_noop.c
View File

@ -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;
}

2
plugin/auth_pam/auth_pam_base.c
View File

@ -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;

4
plugin/hashicorp_key_management/hashicorp_key_management.cnf
View File

@ -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.
#

4
plugin/hashicorp_key_management/hashicorp_key_management.txt
View File

@ -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.

2
scripts/fill_help_tables.sql
View File

File diff suppressed because one or more lines are too long

2
scripts/mariadb_system_tables_fix.sql
View File

@ -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 //

10
scripts/mysqlaccess.sh
View File

@ -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. <psmith)
@ -443,7 +443,7 @@ use IPC::Open3;
$DEBUG = 0;
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>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();

10
scripts/mytop.sh
View File

@ -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<mytop> (recommended), install
In addition, if you want a color B<mytop> (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<FLUSH STATUS> command.
=item B<R>
Togle IP reverse lookup. Default is on.
Toggle IP reverse lookup. Default is on.
=item B<s>

2
scripts/sys_schema/README.md
View File

@ -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 |
+----------------+--------------+------+-----+---------+-------+

2
scripts/sys_schema/views/p_s/metrics_56.sql
View File

@ -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

2
scripts/wsrep_sst_mariabackup.sh
View File

@ -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:

2
scripts/wsrep_sst_mysqldump.sh
View File

@ -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

2
sql-bench/Comments/Empress.crash-me
View File

@ -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 ...

4
sql-bench/Comments/interbase
View File

@ -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)

4
sql-bench/Comments/postgres.benchmark
View File

@ -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

8
sql-bench/Comments/postgres.crash-me
View File

@ -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 ...

2
sql-bench/README
View File

@ -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

2
sql-bench/copy-db.sh
View File

@ -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,

14
sql-bench/crash-me.sh
View File

@ -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})

4
sql-bench/graph-compare-results.sh
View File

@ -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);

4
sql-bench/server-cfg.sh
View File

@ -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;

2
sql/field.h
View File

@ -5422,7 +5422,7 @@ public:
bool explicitly_nullable;
/*
This is additinal data provided for any computed(virtual) 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.
*/

4
sql/handler.cc
View File

@ -3263,7 +3263,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),
@ -8403,7 +8403,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.

2
sql/handler.h
View File

@ -3860,7 +3860,7 @@ public:
/*
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);

4
sql/item.cc
View File

@ -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

6
sql/item.h
View File

@ -1365,7 +1365,7 @@ public:
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 @@ public:
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
{

2
sql/item_func.h
View File

@ -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;

2
sql/item_sum.cc
View File

@ -521,7 +521,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('(');

2
sql/item_sum.h
View File

@ -71,7 +71,7 @@ public:
/**
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;

2
sql/log_event_client.cc
View File

@ -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) +

2
sql/log_event_server.cc
View File

@ -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);

2
sql/mdl.h
View File

@ -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)

2
sql/my_json_writer.h
View File

@ -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.

2
sql/mysqld.cc
View File

@ -9626,7 +9626,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};

2
sql/mysqld.h
View File

@ -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),

2
sql/opt_histogram_json.cc
View File

@ -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()))
{

2
sql/opt_trace.cc
View File

@ -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;

2
sql/protocol.cc
View File

@ -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.

4
sql/rpl_gtid.cc
View File

@ -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);
}

2
sql/share/README.md
View File

@ -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:

2
sql/share/charsets/Index.xml
View File

@ -385,7 +385,7 @@ To make maintaining easier please:
<family>Cyrillic</family>
<description>KOI8-U Ukrainian</description>
<alias>koi8-u</alias>
<collation name="koi8u_general_ci" id="22" order="Ukranian" flag="primary"/>
<collation name="koi8u_general_ci" id="22" order="Ukrainian" flag="primary"/>
<collation name="koi8u_bin" id="75" order="Binary" flag="binary"/>
<collation name="koi8u_general_nopad_ci" id="1046" flag="nopad">
<rules>

2
sql/share/errmsg-utf8.txt
View File

@ -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' "

2
sql/slave.cc
View File

@ -1349,7 +1349,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.

2
sql/sql_acl.cc
View File

@ -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

8
sql/sql_base.cc
View File

@ -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))
{
@ -8063,8 +8063,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);
@ -9596,7 +9596,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

4
sql/sql_class.cc
View File

@ -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.

4
sql/sql_class.h
View File

@ -3120,7 +3120,7 @@ public:
#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
@ -5024,7 +5024,7 @@ public:
/*
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

4
sql/sql_const.h
View File

@ -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

2
sql/sql_lex.cc
View File

@ -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

4
sql/sql_lex.h
View File

@ -949,7 +949,7 @@ Field_pair *find_matching_field_pair(Item *item, List<Field_pair> 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 @@ public:
/* 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

2
sql/sql_lifo_buffer.h
View File

@ -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

6
sql/sql_parse.cc
View File

@ -2186,7 +2186,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);
@ -3632,7 +3632,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:
@ -5951,7 +5951,7 @@ finish:
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.

2
sql/sql_rename.cc
View File

@ -65,7 +65,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())

2
sql/sql_select.cc
View File

@ -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

4
sql/sql_select.h
View File

@ -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 @@ public:
/*
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;

2
sql/sql_table.cc
View File

@ -5846,7 +5846,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);

2
sql/sql_truncate.cc
View File

@ -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 ||

2
sql/sql_type.h
View File

@ -853,7 +853,7 @@ public:
/*
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.
*/

22
sql/sql_yacc.yy
View File

@ -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));
@ -13248,7 +13248,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;
@ -14662,7 +14662,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
*/
{
@ -16306,7 +16306,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:
@ -19717,7 +19717,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;

2
sql/sys_vars.cc
View File

@ -5171,7 +5171,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

2
sql/threadpool_common.cc
View File

@ -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

2
storage/connect/ha_connect.cc
View File

@ -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
*/

2
storage/connect/plgdbsem.h
View File

@ -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;

2
storage/connect/xindex.cpp
View File

@ -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)
{

2
storage/csv/ha_tina.cc
View File

@ -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

2
storage/federated/ha_federated.cc
View File

@ -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,

2
storage/innobase/include/dict0mem.h
View File

@ -2515,7 +2515,7 @@ public:
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
{

2
storage/innobase/include/lock0prdt.h
View File

@ -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(
/*====================*/

2
storage/innobase/include/trx0purge.h
View File

@ -265,7 +265,7 @@ public:
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 */

2
storage/innobase/include/univ.i
View File

@ -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

2
storage/maria/aria_chk.c
View File

@ -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\

2
storage/maria/aria_dump_log.c
View File

@ -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,

4
storage/maria/aria_pack.c
View File

@ -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)
{

Some files were not shown because too many files have changed in this diff Show More