mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lintian complains on spelling error

Browse source 
The lintian check complains on spelling error:
https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
This commit is contained in:
Faustin Lammler 2018-12-21 17:06:08 -03:00 committed by Vicențiu-Marian Ciorbaru
parent db32d9457e
commit 2df2238cb8
82 changed files with 110 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/mysqldump.c
View file

@ -4548,7 +4548,7 @@ static int dump_databases(char **db_names)
/*
View Specific database initalization.
View Specific database initialization.
SYNOPSIS
init_dumping_views
@ -4565,7 +4565,7 @@ int init_dumping_views(char *qdatabase __attribute__((unused)))
/*
Table Specific database initalization.
Table Specific database initialization.
SYNOPSIS
init_dumping_tables

2
debian/additions/innotop/innotop vendored
View file

@ -1607,7 +1607,7 @@ my %exprs = (
my %columns = (
active_secs => { hdr => 'SecsActive', num => 1, label => 'Seconds transaction has been active', },
add_pool_alloc => { hdr => 'Add\'l Pool', num => 1, label => 'Additonal pool allocated' },
add_pool_alloc => { hdr => 'Add\'l Pool', num => 1, label => 'Additional pool allocated' },
attempted_op => { hdr => 'Action', num => 0, label => 'The action that caused the error' },
awe_mem_alloc => { hdr => 'AWE Memory', num => 1, label => '[Windows] AWE memory allocated' },
binlog_cache_overflow => { hdr => 'Binlog Cache', num => 1, label => 'Transactions too big for binlog cache that went to disk' },

4
extra/innochecksum.cc
View file

@ -349,7 +349,7 @@ error_message(
/***********************************************//*
@param>>_______[in] name>_____name of file.
@retval file pointer; file pointer is NULL when error occured.
@retval file pointer; file pointer is NULL when error occurred.
*/
FILE*
@ -1136,7 +1136,7 @@ parse_page(
/**
@param [in/out] file_name name of the filename
@retval FILE pointer if successfully created else NULL when error occured.
@retval FILE pointer if successfully created else NULL when error occurred.
*/
FILE*
create_file(

2
extra/mariabackup/innobackupex.cc
View file

@ -716,7 +716,7 @@ The --decompress command will decompress a backup made\n\
with the --compress option. The\n\
--parallel option will allow multiple files to be decompressed\n\
simultaneously. In order to decompress, the qpress utility MUST be installed\n\
and accessable within the path. This process will remove the original\n\
and accessible within the path. This process will remove the original\n\
compressed files and leave the results in the same location.\n\
\n\
On success the exit code innobackupex is 0. A non-zero exit code \n\

2
extra/mariabackup/xtrabackup.cc
View file

@ -1969,7 +1969,7 @@ static bool innodb_init_param()
return false;
error:
msg("mariabackup: innodb_init_param(): Error occured.\n");
msg("mariabackup: innodb_init_param(): Error occurred.\n");
return true;
}

4
extra/yassl/src/yassl_error.cpp
View file

@ -242,11 +242,11 @@ void SetErrorString(YasslError error, char* buffer)
strncpy(buffer, "ASN: bad Signature Length", max);
break;
case UNKOWN_SIG_E :
case UNKNOWN_SIG_E :
strncpy(buffer, "ASN: unknown signature OID", max);
break;
case UNKOWN_HASH_E :
case UNKNOWN_HASH_E :
strncpy(buffer, "ASN: unknown hash OID", max);
break;

4
extra/yassl/taocrypt/include/error.hpp
View file

@ -58,8 +58,8 @@ TIME_E = 1030, // "bad TIME"
DATE_SZ_E = 1031, // "bad Date Size"
SIG_LEN_E = 1032, // "bad Signature Length"
UNKOWN_SIG_E = 1033, // "unknown signature OID"
UNKOWN_HASH_E = 1034, // "unknown hash OID"
UNKNOWN_SIG_E = 1033, // "unknown signature OID"
UNKNOWN_HASH_E = 1034, // "unknown hash OID"
DSA_SZ_E = 1035, // "bad DSA r or s size"
BEFORE_DATE_E = 1036, // "before date in the future"
AFTER_DATE_E = 1037, // "after date in the past"

4
extra/yassl/taocrypt/src/asn.cpp
View file

@ -1007,7 +1007,7 @@ bool CertDecoder::ConfirmSignature(Source& pub)
}
#endif
else {
source_.SetError(UNKOWN_SIG_E);
source_.SetError(UNKNOWN_SIG_E);
return false;
}
@ -1132,7 +1132,7 @@ word32 DER_Encoder::SetAlgoID(HashType aOID, byte* output)
break;
default:
error_.SetError(UNKOWN_HASH_E);
error_.SetError(UNKNOWN_HASH_E);
return 0;
}

2
mysql-test/main/create.result
View file

@ -945,7 +945,7 @@ drop table t1;
Bug #26104 Bug on foreign key class constructor
Check that ref_columns is initalized correctly in the constructor
Check that ref_columns is initialized correctly in the constructor
and semantic checks in mysql_prepare_table work.
We do not need a storage engine that supports foreign keys

2
mysql-test/main/create.test
View file

@ -846,7 +846,7 @@ drop table t1;
--echo
--echo Bug #26104 Bug on foreign key class constructor
--echo
--echo Check that ref_columns is initalized correctly in the constructor
--echo Check that ref_columns is initialized correctly in the constructor
--echo and semantic checks in mysql_prepare_table work.
--echo
--echo We do not need a storage engine that supports foreign keys

2
mysql-test/main/mysqld--help.result
View file

@ -1069,7 +1069,7 @@ The following specify which files/extra groups are read (specified before remain
disable; STATE to track just transaction state (Is there
an active transaction? Does it have any data? etc.);
CHARACTERISTICS to track transaction state and report all
statements needed to start a transaction withthe same
statements needed to start a transaction with the same
characteristics (isolation level, read only/read
write,snapshot - but not any work done / data modified
within the transaction).

2
mysql-test/main/sp-bugs.result
View file

@ -1,5 +1,5 @@
#
# Bug #47412: Valgrind warnings / user can read uninitalized memory
# Bug #47412: Valgrind warnings / user can read uninitialized memory
# using SP variables
#
CREATE SCHEMA testdb;

2
mysql-test/main/sp-bugs.test
View file

@ -1,7 +1,7 @@
# Test file for stored procedure bugfixes
--echo #
--echo # Bug #47412: Valgrind warnings / user can read uninitalized memory
--echo # Bug #47412: Valgrind warnings / user can read uninitialized memory
--echo # using SP variables
--echo #

2
mysql-test/main/sp-security.test
View file

@ -342,7 +342,7 @@ flush privileges;
drop table t1;
#
# Bug#9503 reseting correct parameters of thread after error in SP function
# Bug#9503 resetting correct parameters of thread after error in SP function
#
connect (root,localhost,root,,test);
connection root;

2
mysql-test/main/type_bit.test
View file

@ -262,7 +262,7 @@ select hex(a), b from t1;
drop table t1;
#
# type was not properly initalized, which caused key_copy to fail
# type was not properly initialized, which caused key_copy to fail
#
create table t1(bit_field bit(2), int_field int, key a(bit_field));

12
mysql-test/suite/compat/oracle/r/func_misc.result
View file

@ -32,7 +32,7 @@ CALL p1('SELECT 1');
1
1
'Error1: ' || SQLCODE || ' ' || SQLERRM
Error1: 0 normal, successful completition
Error1: 0 normal, successful completion
CALL p1('xxx');
'Error2: ' || SQLCODE || ' ' || SQLERRM
Error2: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '' at line 1
@ -40,7 +40,7 @@ CALL p1('SELECT 1');
1
1
'Error1: ' || SQLCODE || ' ' || SQLERRM
Error1: 0 normal, successful completition
Error1: 0 normal, successful completion
DROP PROCEDURE p1;
#
# SQLCODE and SQLERRM hidden by local variables
@ -219,7 +219,7 @@ f1()
Exception|1329 No data - zero rows fetched, selected, or processed
SELECT f2() FROM DUAL;
f2()
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completition
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completion
DROP TABLE t1;
DROP FUNCTION f2;
DROP FUNCTION f1;
@ -246,7 +246,7 @@ f1()
Exception|1329 No data - zero rows fetched, selected, or processed
SELECT f2() FROM DUAL;
f2()
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completition
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completion
DROP TABLE t1;
DROP FUNCTION f2;
DROP FUNCTION f1;
@ -274,7 +274,7 @@ END;
$$
SELECT f2() FROM DUAL;
f2()
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completition
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completion
DROP FUNCTION f2;
DROP PROCEDURE p1;
DROP TABLE t1;
@ -299,7 +299,7 @@ END;
$$
SELECT f2() FROM DUAL;
f2()
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completition
Exception|1329 No data - zero rows fetched, selected, or processed|0 normal, successful completion
DROP FUNCTION f2;
DROP PROCEDURE p1;
DROP TABLE t1;

2
mysql-test/suite/funcs_1/views/views_master.inc
View file

@ -764,7 +764,7 @@ CREATE VIEW test.v2 AS SELECT * FROM test.t0;
CREATE VIEW test2.v2 AS SELECT * FROM test2.t0;
# Some additional tests on the just created objects to show that they are
# accessable and do have the expected content.
# accessible and do have the expected content.
# INSERTs with full qualified table
INSERT INTO test.t1 VALUES('test.t1 - 1');
INSERT INTO test2.t1 VALUES('test2.t1 - 1');

2
mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result
View file

@ -97,7 +97,7 @@ buffer_LRU_batch_flush_avg_time_thread buffer 0 NULL NULL NULL 0 NULL NULL NULL
buffer_flush_adaptive_avg_time_est buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Estimated time (ms) spent for adaptive flushing recently.
buffer_LRU_batch_flush_avg_time_est buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Estimated time (ms) spent for LRU batch flushing recently.
buffer_flush_avg_time buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Avg time (ms) spent for flushing recently.
buffer_flush_adaptive_avg_pass buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Numner of adaptive flushes passed during the recent Avg period.
buffer_flush_adaptive_avg_pass buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Number of adaptive flushes passed during the recent Avg period.
buffer_LRU_batch_flush_avg_pass buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Number of LRU batch flushes passed during the recent Avg period.
buffer_flush_avg_pass buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Number of flushes passed during the recent Avg period.
buffer_LRU_get_free_loops buffer 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL disabled counter Total loops in LRU get free.

2
mysql-test/suite/rpl/r/rpl_mdev-11092.result
View file

@ -1,7 +1,7 @@
include/master-slave.inc
[connection master]
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
call mtr.add_suppression("Slave SQL: The incident LOST_EVENTS occured on the master. .*");
call mtr.add_suppression("Slave SQL: The incident LOST_EVENTS occurred on the master. .*");
SET GLOBAL max_binlog_cache_size = 4096;
SET GLOBAL binlog_cache_size = 4096;
SET GLOBAL max_binlog_stmt_cache_size = 4096;

2
mysql-test/suite/rpl/t/rpl_mdev-11092.test
View file

@ -6,7 +6,7 @@
########################################################################################
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
call mtr.add_suppression("Slave SQL: The incident LOST_EVENTS occured on the master. .*");
call mtr.add_suppression("Slave SQL: The incident LOST_EVENTS occurred on the master. .*");
let $old_max_binlog_cache_size= query_get_value(SHOW VARIABLES LIKE "max_binlog_cache_size", Value, 1);
let $old_binlog_cache_size= query_get_value(SHOW VARIABLES LIKE "binlog_cache_size", Value, 1);

2
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View file

@ -3355,7 +3355,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME SESSION_TRACK_TRANSACTION_INFO
VARIABLE_SCOPE SESSION
VARIABLE_TYPE ENUM
VARIABLE_COMMENT Track changes to the transaction attributes. OFF to disable; STATE to track just transaction state (Is there an active transaction? Does it have any data? etc.); CHARACTERISTICS to track transaction state and report all statements needed to start a transaction withthe same characteristics (isolation level, read only/read write,snapshot - but not any work done / data modified within the transaction).
VARIABLE_COMMENT Track changes to the transaction attributes. OFF to disable; STATE to track just transaction state (Is there an active transaction? Does it have any data? etc.); CHARACTERISTICS to track transaction state and report all statements needed to start a transaction with the same characteristics (isolation level, read only/read write,snapshot - but not any work done / data modified within the transaction).
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL

2
mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test
View file

@ -64,7 +64,7 @@ SELECT @@global.ft_boolean_syntax;
--echo '#--------------------FN_DYNVARS_033_03-------------------------#'
######################################################################
# see if it is accessable using session scope #
# see if it is accessible using session scope #
######################################################################
--Error ER_GLOBAL_VARIABLE
SET @@session.ft_boolean_syntax = '# -><()!*:""&|';

2
mysql-test/suite/sys_vars/t/init_connect_basic.test
View file

@ -66,7 +66,7 @@ SELECT @@global.init_connect;
--echo '#--------------------FN_DYNVARS_036_03-------------------------#'
######################################################################
# see if it is accessable using session scope #
# see if it is accessible using session scope #
######################################################################
--Error ER_GLOBAL_VARIABLE
SET @@session.init_connect = '';

2
mysql-test/suite/sys_vars/t/init_slave_basic.test
View file

@ -66,7 +66,7 @@ SELECT @@global.init_slave;
--echo '#--------------------FN_DYNVARS_037_03-------------------------#'
######################################################################
# see if it is accessable using session scope #
# see if it is accessible using session scope #
######################################################################
--Error ER_GLOBAL_VARIABLE
SET @@session.init_slave = '';

2
mysql-test/suite/sys_vars/t/timestamp_basic.test
View file

@ -47,7 +47,7 @@ SELECT floor(@@timestamp) = UNIX_TIMESTAMP(), @@timestamp = UNIX_TIMESTAMP(NOW(6
--echo '#---------------------FN_DYNVARS_001_02-------------------------#'
##############################################################
# see if accessable using global scope #
# see if accessible using global scope #
##############################################################
--Error ER_LOCAL_VARIABLE

2
pcre/ChangeLog
View file

@ -1605,7 +1605,7 @@ Version 8.21 12-Dec-2011
are added as well.
3. Fix cache-flush issue on PowerPC (It is still an experimental JIT port).
PCRE_EXTRA_TABLES is not suported by JIT, and should be checked before
PCRE_EXTRA_TABLES is not supported by JIT, and should be checked before
calling _pcre_jit_exec. Some extra comments are added.
4. (*MARK) settings inside atomic groups that do not contain any capturing

4
pcre/doc/html/pcredemo.html
View file

@ -161,7 +161,7 @@ if (rc &lt; 0)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\nMatch succeeded at offset %d\n", ovector[0]);
@ -379,7 +379,7 @@ for (;;)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\nMatch succeeded again at offset %d\n", ovector[0]);

2
pcre/doc/html/pcrejit.html
View file

@ -299,7 +299,7 @@ recommended.
This is a suggestion for how a multithreaded program that needs to set up
non-default JIT stacks might operate:
<pre>
During thread initalization
During thread initialization
thread_local_var = pcre_jit_stack_alloc(...)
During thread exit

2
pcre/doc/pcre.txt
View file

@ -8578,7 +8578,7 @@ CONTROLLING THE JIT STACK
This is a suggestion for how a multithreaded program that needs to set
up non-default JIT stacks might operate:
During thread initalization
During thread initialization
thread_local_var = pcre_jit_stack_alloc(...)
During thread exit

4
pcre/doc/pcredemo.3
View file

@ -161,7 +161,7 @@ if (rc < 0)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\enMatch succeeded at offset %d\en", ovector[0]);
@ -379,7 +379,7 @@ for (;;)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\enMatch succeeded again at offset %d\en", ovector[0]);

2
pcre/doc/pcrejit.3
View file

@ -285,7 +285,7 @@ recommended.
This is a suggestion for how a multithreaded program that needs to set up
non-default JIT stacks might operate:
.sp
During thread initalization
During thread initialization
thread_local_var = pcre_jit_stack_alloc(...)
.sp
During thread exit

2
pcre/pcre_compile.c
View file

@ -8352,7 +8352,7 @@ save_hwm_offset = cd->hwm - cd->start_workspace;
/* Accumulate the length for use in the pre-compile phase. Start with the
length of the BRA and KET and any extra bytes that are required at the
beginning. We accumulate in a local variable to save frequent testing of
lenthptr for NULL. We cannot do this by looking at the value of code at the
lengthptr for NULL. We cannot do this by looking at the value of code at the
start and end of each alternative, because compiled items are discarded during
the pre-compile phase so that the work space is not exceeded. */

2
pcre/pcre_internal.h
View file

@ -2188,7 +2188,7 @@ regex. The lengths are used when searching for specific things, and also in the
debugging printing of a compiled regex. We use a macro so that it can be
defined close to the definitions of the opcodes themselves.
As things have been extended, some of these are no longer fixed lenths, but are
As things have been extended, some of these are no longer fixed lengths, but are
minima instead. For example, the length of a single-character repeat may vary
in UTF-8 mode. The code that uses this table must know about such things. */

4
pcre/pcredemo.c
View file

@ -144,7 +144,7 @@ if (rc < 0)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\nMatch succeeded at offset %d\n", ovector[0]);
@ -362,7 +362,7 @@ for (;;)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\nMatch succeeded again at offset %d\n", ovector[0]);

2
scripts/mysql_system_tables_data.sql
View file

@ -14,7 +14,7 @@
-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
--
-- The inital data for system tables of MySQL Server
-- The initial data for system tables of MySQL Server
--
-- When setting up a "cross bootstrap" database (e.g., creating data on a Unix

2
sql-bench/bench-init.pl.sh
View file

@ -566,7 +566,7 @@ All benchmarks takes the following options:
When using --fast the suffix is automaticly set to '_fast'.
--random
Inform test suite that we are generate random inital values for sequence of
Inform test suite that we are generate random initial values for sequence of
test executions. It should be used for imitation of real conditions.
--threads=# **DEPRECATED**

2
sql-common/client.c
View file

@ -3527,7 +3527,7 @@ my_bool mysql_reconnect(MYSQL *mysql)
if (ctxt)
my_context_install_suspend_resume_hook(ctxt, NULL, NULL);
DBUG_PRINT("info", ("reconnect succeded"));
DBUG_PRINT("info", ("reconnect succeeded"));
tmp_mysql.reconnect= 1;
tmp_mysql.free_me= mysql->free_me;

4
sql/ha_partition.cc
View file

@ -564,7 +564,7 @@ bool ha_partition::initialize_partition(MEM_ROOT *mem_root)
point.
If you do not implement this, the default delete_table() is called from
handler.cc and it will delete all files with the file extentions returned
handler.cc and it will delete all files with the file extensions returned
by bas_ext().
Called from handler.cc by delete_table and ha_create_table(). Only used
@ -596,7 +596,7 @@ int ha_partition::delete_table(const char *name)
Renames a table from one name to another from alter table call.
If you do not implement this, the default rename_table() is called from
handler.cc and it will rename all files with the file extentions returned
handler.cc and it will rename all files with the file extensions returned
by bas_ext().
Called from sql_table.cc by mysql_rename_table().

2
sql/ha_sequence.cc
View file

@ -108,7 +108,7 @@ int ha_sequence::open(const char *name, int mode, uint flags)
MY_TEST(flags & HA_OPEN_INTERNAL_TABLE);
reset_statistics();
/* Don't try to read the inital row the call is part of create code */
/* Don't try to read the initial row the call is part of create code */
if (!(flags & (HA_OPEN_FOR_CREATE | HA_OPEN_FOR_REPAIR)))
{
if (unlikely((error= table->s->sequence->read_initial_values(table))))

4
sql/handler.h
View file

@ -1490,9 +1490,9 @@ struct handlerton
Used by open_table_error(), by the default rename_table and delete_table
handler methods, and by the default discovery implementation.
For engines that have more than one file name extentions (separate
For engines that have more than one file name extensions (separate
metadata, index, and/or data files), the order of elements is relevant.
First element of engine file name extentions array should be metadata
First element of engine file name extensions array should be metadata
file extention. This is implied by the open_table_error()
and the default discovery implementation.

4
sql/item.cc
View file

@ -2797,7 +2797,7 @@ bool Type_std_attributes::agg_item_set_converter(const DTCollation &coll,
@retval
clone of the item
0 if an error occured
0 if an error occurred
*/
Item* Item_func_or_sum::build_clone(THD *thd)
@ -3097,7 +3097,7 @@ Item_sp::init_result_field(THD *thd, uint max_length, uint maybe_null,
@retval
clone of the item
0 if an error occured
0 if an error occurred
*/
Item* Item_ref::build_clone(THD *thd)

2
sql/item_cmpfunc.cc
View file

@ -4976,7 +4976,7 @@ void Item_cond::neg_arguments(THD *thd)
@retval
clone of the item
0 if an error occured
0 if an error occurred
*/
Item *Item_cond::build_clone(THD *thd)

2
sql/item_strfunc.cc
View file

@ -2404,7 +2404,7 @@ String *Item_func_sqlerrm::val_str(String *str)
system_charset_info);
return str;
}
str->copy(STRING_WITH_LEN("normal, successful completition"),
str->copy(STRING_WITH_LEN("normal, successful completion"),
system_charset_info);
return str;
}

2
sql/lex.h
View file

@ -23,7 +23,7 @@
#include "lex_symbol.h"
SYM_GROUP sym_group_common= {"", ""};
SYM_GROUP sym_group_geom= {"Spatial extentions", "HAVE_SPATIAL"};
SYM_GROUP sym_group_geom= {"Spatial extensions", "HAVE_SPATIAL"};
SYM_GROUP sym_group_rtree= {"RTree keys", "HAVE_RTREE_KEYS"};
/* We don't want to include sql_yacc.h into gen_lex_hash */

2
sql/log_event.h
View file

@ -3590,7 +3590,7 @@ public:
bool write_data_header();
bool write_data_body();
/*
Cut out Create_file extentions and
Cut out Create_file extensions and
write it as Load event - used on the slave
*/
bool write_base();

4
sql/log_event_old.cc
View file

@ -835,7 +835,7 @@ int Write_rows_log_event_old::do_after_row_operations(TABLE *table, int error)
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
/*
reseting the extra with
resetting the extra with
table->file->extra(HA_EXTRA_NO_IGNORE_NO_KEY);
fires bug#27077
todo: explain or fix
@ -2459,7 +2459,7 @@ Write_rows_log_event_old::do_after_row_operations(const Slave_reporting_capabili
m_table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
m_table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
/*
reseting the extra with
resetting the extra with
table->file->extra(HA_EXTRA_NO_IGNORE_NO_KEY);
fires bug#27077
todo: explain or fix

2
sql/mysql_upgrade_service.cc
View file

@ -134,7 +134,7 @@ static void die(const char *fmt, ...)
}
/*
Stop service that we started, if it was not initally running at
Stop service that we started, if it was not initially running at
program start.
*/
if (initial_service_state != UINT_MAX && initial_service_state != SERVICE_RUNNING)

2
sql/opt_subselect.cc
View file

@ -4399,7 +4399,7 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd)
field->reset();
/*
Test if there is a default field value. The test for ->ptr is to skip
'offset' fields generated by initalize_tables
'offset' fields generated by initialize_tables
*/
// Initialize the table field:
bzero(field->ptr, field->pack_length());

2
sql/rpl_mi.cc
View file

@ -1173,7 +1173,7 @@ bool Master_info_index::init_all_master_info()
}
else
{
/* Initialization of Master_info succeded. Add it to HASH */
/* Initialization of Master_info succeeded. Add it to HASH */
if (global_system_variables.log_warnings > 1)
sql_print_information("Initialized Master_info from '%s'",
buf_master_info_file);

4
sql/session_tracker.cc
View file

@ -810,7 +810,7 @@ bool Transaction_state_tracker::store(THD *thd, String *buf)
statement even for a transaction that isn't the first in an
ongoing chain. Consider
SET TRANSACTION ISOLATION LEVEL READ UNCOMMITED;
SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
START TRANSACTION READ ONLY, WITH CONSISTENT SNAPSHOT;
# work
COMMIT AND CHAIN;
@ -818,7 +818,7 @@ bool Transaction_state_tracker::store(THD *thd, String *buf)
If we switch away at this point, the replay in the new session
needs to be
SET TRANSACTION ISOLATION LEVEL READ UNCOMMITED;
SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
START TRANSACTION READ ONLY;
When a transaction ends (COMMIT/ROLLBACK sans CHAIN), all

4
sql/share/errmsg-utf8.txt
View file

@ -7455,7 +7455,7 @@ ER_GIS_UNSUPPORTED_ARGUMENT
eng "Calling geometry function %s with unsupported types of arguments."
ER_GIS_UNKNOWN_ERROR
eng "Unknown GIS error occured in function %s."
eng "Unknown GIS error occurred in function %s."
ER_GIS_UNKNOWN_EXCEPTION
eng "Unknown exception caught in GIS function %s."
@ -7869,7 +7869,7 @@ ER_DROP_VERSIONING_SYSTEM_TIME_PARTITION
eng "Can not DROP SYSTEM VERSIONING for table %`s partitioned BY SYSTEM_TIME"
ER_VERS_DB_NOT_SUPPORTED
eng "System versioning tables in the %`s database are not suported"
eng "System versioning tables in the %`s database are not supported"
ER_VERS_TRT_IS_DISABLED
eng "Transaction registry is disabled"

2
sql/sql_admin.cc
View file

@ -175,7 +175,7 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list,
/*
Check if this is a table type that stores index and data separately,
like ISAM or MyISAM. We assume fixed order of engine file name
extentions array. First element of engine file name extentions array
extensions array. First element of engine file name extensions array
is meta/index file extention. Second element - data file extention.
*/
ext= table->file->bas_ext();

4
sql/sql_db.cc
View file

@ -50,7 +50,7 @@
#define MAX_DROP_TABLE_Q_LEN 1024
const char *del_exts[]= {".BAK", ".opt", NullS};
static TYPELIB deletable_extentions=
static TYPELIB deletable_extensions=
{array_elements(del_exts)-1,"del_exts", del_exts, NULL};
static bool find_db_tables_and_rm_known_files(THD *, MY_DIR *, const char *,
@ -1140,7 +1140,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp,
}
if (!(extension= strrchr(file->name, '.')))
extension= strend(file->name);
if (find_type(extension, &deletable_extentions, FIND_TYPE_NO_PREFIX) > 0)
if (find_type(extension, &deletable_extensions, FIND_TYPE_NO_PREFIX) > 0)
{
strxmov(filePath, path, "/", file->name, NullS);
/*

2
sql/sql_join_cache.cc
View file

@ -2141,7 +2141,7 @@ enum_nested_loop_state JOIN_CACHE::join_records(bool skip_last)
DBUG_ASSERT(!is_key_access());
/*
Restore the last record from the join buffer to generate
all extentions for it.
all extensions for it.
*/
get_record();
}

4
sql/sql_repl.cc
View file

@ -3289,7 +3289,7 @@ int reset_slave(THD *thd, Master_info* mi)
char fname[FN_REFLEN];
int thread_mask= 0, error= 0;
uint sql_errno=ER_UNKNOWN_ERROR;
const char* errmsg= "Unknown error occurred while reseting slave";
const char* errmsg= "Unknown error occurred while resetting slave";
char master_info_file_tmp[FN_REFLEN];
char relay_log_info_file_tmp[FN_REFLEN];
DBUG_ENTER("reset_slave");
@ -3875,7 +3875,7 @@ int reset_master(THD* thd, rpl_gtid *init_state, uint32 init_state_len,
}
bool ret= 0;
/* Temporarily disable master semisync before reseting master. */
/* Temporarily disable master semisync before resetting master. */
repl_semisync_master.before_reset_master();
ret= mysql_bin_log.reset_logs(thd, 1, init_state, init_state_len,
next_log_number);

2
sql/sql_select.cc
View file

@ -17818,7 +17818,7 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
/*
Test if there is a default field value. The test for ->ptr is to skip
'offset' fields generated by initalize_tables
'offset' fields generated by initialize_tables
*/
if (default_field[i] && default_field[i]->ptr)
{

4
sql/sql_servers.cc
View file

@ -431,7 +431,7 @@ insert_server_record_into_cache(FOREIGN_SERVER *server)
int error=0;
DBUG_ENTER("insert_server_record_into_cache");
/*
We succeded in insertion of the server to the table, now insert
We succeeded in insertion of the server to the table, now insert
the server to the cache
*/
DBUG_PRINT("info", ("inserting server %s at %p, length %zd",
@ -686,7 +686,7 @@ delete_server_record_in_cache(LEX_SERVER_OPTIONS *server_options)
goto end;
}
/*
We succeded in deletion of the server to the table, now delete
We succeeded in deletion of the server to the table, now delete
the server from the cache
*/
DBUG_PRINT("info",("deleting server %s length %zd",

2
sql/sys_vars.cc
View file

@ -6164,7 +6164,7 @@ static Sys_var_enum Sys_session_track_transaction_info(
"Track changes to the transaction attributes. OFF to disable; "
"STATE to track just transaction state (Is there an active transaction? "
"Does it have any data? etc.); CHARACTERISTICS to track transaction "
"state and report all statements needed to start a transaction with"
"state and report all statements needed to start a transaction with "
"the same characteristics (isolation level, read only/read write,"
"snapshot - but not any work done / data modified within the "
"transaction).",

2
sql/table.h
View file

@ -3111,7 +3111,7 @@ public:
@param[in] timestamp
@param[in] true if we search for a lesser timestamp, false if greater
@retval true if exists, false it not exists or an error occured
@retval true if exists, false it not exists or an error occurred
*/
bool query(MYSQL_TIME &commit_time, bool backwards);
/**

2
sql/threadpool_common.cc
View file

@ -185,7 +185,7 @@ void tp_callback(TP_connection *c)
}
else if (threadpool_process_request(thd))
{
/* QUIT or an error occured. */
/* QUIT or an error occurred. */
goto error;
}

6
sql/wsrep_hton.cc
View file

@ -95,7 +95,7 @@ void wsrep_register_hton(THD* thd, bool all)
{
trans_register_ha(thd, all, wsrep_hton);
/* follow innodb read/write settting
/* follow innodb read/write setting
* but, as an exception: CTAS with empty result set will not be
* replicated unless we declare wsrep hton as read/write here
*/
@ -275,7 +275,7 @@ static int wsrep_rollback(handlerton *hton, THD *thd, bool all)
if (wsrep && wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle))
{
DBUG_PRINT("wsrep", ("setting rollback fail"));
WSREP_ERROR("settting rollback fail: thd: %llu, schema: %s, SQL: %s",
WSREP_ERROR("setting rollback fail: thd: %llu, schema: %s, SQL: %s",
(long long)thd->real_id, thd->get_db(), thd->query());
}
wsrep_cleanup_transaction(thd);
@ -316,7 +316,7 @@ int wsrep_commit(handlerton *hton, THD *thd, bool all)
if (wsrep && wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle))
{
DBUG_PRINT("wsrep", ("setting rollback fail"));
WSREP_ERROR("settting rollback fail: thd: %llu, schema: %s, SQL: %s",
WSREP_ERROR("setting rollback fail: thd: %llu, schema: %s, SQL: %s",
(long long)thd->real_id, thd->get_db(),
thd->query());
}

2
storage/connect/filamzip.cpp
View file

@ -700,7 +700,7 @@ bool UNZIPUTL::openEntry(PGLOBAL g)
} // endif rc
if (trace(1))
htrc("Openning entry%s %s\n", fn, (entryopen) ? "oked" : "failed");
htrc("Opening entry%s %s\n", fn, (entryopen) ? "oked" : "failed");
return !entryopen;
} // end of openEntry

4
storage/connect/ha_connect.cc
View file

@ -704,9 +704,9 @@ DllExport LPCSTR PlugSetPath(LPSTR to, LPCSTR name, LPCSTR dir)
used by the default rename_table and delete_table method in
handler.cc.
For engines that have two file name extentions (separate meta/index file
For engines that have two file name extensions (separate meta/index file
and data file), the order of elements is relevant. First element of engine
file name extentions array should be meta/index file extention. Second
file name extensions array should be meta/index file extention. Second
element - data file extention. This order is assumed by
prepare_for_repair() when REPAIR TABLE ... USE_FRM is issued.

2
storage/connect/javaconn.cpp
View file

@ -142,7 +142,7 @@ bool JAVAConn::Check(jint rc)
s = (jstring)env->CallObjectMethod(exc, tid);
Msg = GetUTFString(s);
} else
Msg = "Exception occured";
Msg = "Exception occurred";
env->ExceptionClear();
} else if (rc < 0) {

4
storage/example/ha_example.cc
View file

@ -225,9 +225,9 @@ static void init_example_psi_keys()
used by the default rename_table and delete_table method in
handler.cc and by the default discover_many method.
For engines that have two file name extentions (separate meta/index file
For engines that have two file name extensions (separate meta/index file
and data file), the order of elements is relevant. First element of engine
file name extentions array should be meta/index file extention. Second
file name extensions array should be meta/index file extention. Second
element - data file extention. This order is assumed by
prepare_for_repair() when REPAIR TABLE ... USE_FRM is issued.

2
storage/federatedx/AUTHORS
View file

@ -7,5 +7,5 @@ Pluggable Storage Engine Skeleton setup
Brian Aker <brian@mysql.com> | <brian@tangent.org> - Original Design
Calvin Sun - Windows Support
Brian Miezejewski - Bug fixes
Antony T Curtis - Help in inital development, transactions and various help
Antony T Curtis - Help in initial development, transactions and various help
Michael Widenius - Bug fixes and some simple early optimizations

2
storage/innobase/fil/fil0fil.cc
View file

@ -155,7 +155,7 @@ current working directory ".", but in the MySQL Embedded Server Library
it is an absolute path. */
const char* fil_path_to_mysql_datadir;
/** Common InnoDB file extentions */
/** Common InnoDB file extensions */
const char* dot_ext[] = { "", ".ibd", ".isl", ".cfg" };
/** The number of fsyncs done to the log */

2
storage/innobase/include/fil0fil.h
View file

@ -350,7 +350,7 @@ struct fil_node_t {
/** Value of fil_node_t::magic_n */
#define FIL_NODE_MAGIC_N 89389
/** Common InnoDB file extentions */
/** Common InnoDB file extensions */
enum ib_extention {
NO_EXT = 0,
IBD = 1,

2
storage/innobase/include/fil0fil.ic
View file

@ -69,7 +69,7 @@ fil_get_page_type_name(
case FIL_PAGE_TYPE_ZBLOB2:
return "ZBLOB2";
case FIL_PAGE_TYPE_UNKNOWN:
return "OLD UNKOWN PAGE TYPE";
return "OLD UNKNOWN PAGE TYPE";
default:
return "PAGE TYPE CORRUPTED";
}

4
storage/innobase/row/row0sel.cc
View file

@ -4272,7 +4272,7 @@ row_search_mvcc(
|| prebuilt->m_read_virtual_key);
/* Reset the new record lock info if srv_locks_unsafe_for_binlog
is set or session is using a READ COMMITED isolation level. Then
is set or session is using a READ COMMITTED isolation level. Then
we are able to remove the record locks set here on an individual
row. */
prebuilt->new_rec_locks = 0;
@ -4979,7 +4979,7 @@ wrong_offs:
existence with LOCK_REC_NOT_GAP. */
/* If innodb_locks_unsafe_for_binlog option is used
or this session is using a READ COMMITED isolation
or this session is using a READ COMMITTED isolation
level we lock only the record, i.e., next-key locking is
not used. */

2
storage/innobase/srv/srv0mon.cc
View file

@ -423,7 +423,7 @@ static monitor_info_t innodb_counter_info[] =
MONITOR_DEFAULT_START, MONITOR_FLUSH_AVG_TIME},
{"buffer_flush_adaptive_avg_pass", "buffer",
"Numner of adaptive flushes passed during the recent Avg period.",
"Number of adaptive flushes passed during the recent Avg period.",
MONITOR_NONE,
MONITOR_DEFAULT_START, MONITOR_FLUSH_ADAPTIVE_AVG_PASS},

2
storage/maria/ha_maria.cc
View file

@ -1157,7 +1157,7 @@ int ha_maria::open(const char *name, int mode, uint test_if_locked)
/*
For static size rows, tell MariaDB that we will access all bytes
in the record when writing it. This signals MariaDB to initalize
in the record when writing it. This signals MariaDB to initialize
the full row to ensure we don't get any errors from valgrind and
that all bytes in the row is properly reset.
*/

2
storage/maria/ma_close.c
View file

@ -37,7 +37,7 @@ int maria_close(register MARIA_HA *info)
/* Check that we have unlocked key delete-links properly */
DBUG_ASSERT(info->key_del_used == 0);
/* Check that file is not part of any uncommited transactions */
/* Check that file is not part of any uncommitted transactions */
DBUG_ASSERT(info->trn == 0 || info->trn == &dummy_transaction_object);
if (share->reopen == 1)

2
storage/maria/trnman.c
View file

@ -307,7 +307,7 @@ TRN *trnman_new_trn(WT_THD *wt)
if (!(trn= tmp.trn))
{
/*
trn should be completely initalized at create time to allow
trn should be completely initialized at create time to allow
one to keep a known state on it.
(Like redo_lns, which is assumed to be 0 at start of row handling
and reset to zero before end of row handling)

2
storage/myisam/ha_myisam.cc
View file

@ -859,7 +859,7 @@ int ha_myisam::open(const char *name, int mode, uint test_if_locked)
/*
For static size rows, tell MariaDB that we will access all bytes
in the record when writing it. This signals MariaDB to initalize
in the record when writing it. This signals MariaDB to initialize
the full row to ensure we don't get any errors from valgrind and
that all bytes in the row is properly reset.
*/

2
storage/perfschema/pfs_timer.h
View file

@ -100,7 +100,7 @@ extern enum_timer_name stage_timer;
extern enum_timer_name statement_timer;
/**
Timer information data.
Characteristics about each suported timer.
Characteristics about each supported timer.
*/
extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info;

2
storage/rocksdb/mysql-test/rocksdb/t/lock_rows_not_exist.test
View file

@ -57,7 +57,7 @@ DELETE FROM t WHERE id1=1 AND id2=1 AND id3=0;
--disable_parsing
#
# The following is commented out because RocksDB's Transaction API doesn't
# "support" READ COMMITED, in particular, it doesn't release row locks
# "support" READ COMMITTED, in particular, it doesn't release row locks
# after each statement. (MyRocks is able to request a new snapshot for
# every statement, but this won't free the locks. TODO: Is the behavior
# that is tested below really needed?)

2
storage/sphinx/ha_sphinx.cc
View file

@ -3351,7 +3351,7 @@ int ha_sphinx::delete_table ( const char * )
// Renames a table from one name to another from alter table call.
//
// If you do not implement this, the default rename_table() is called from
// handler.cc and it will delete all files with the file extentions returned
// handler.cc and it will delete all files with the file extensions returned
// by bas_ext().
//
// Called from sql_table.cc by mysql_rename_table().

4
storage/tokudb/PerconaFT/ft/loader/loader.cc
View file

@ -1350,7 +1350,7 @@ int merge_row_arrays_base (struct row dest[/*an+bn*/], struct row a[/*an*/], int
* Arguments:
* dest write the rows here
* a,b the rows being merged
* an,bn the lenth of a and b respectively.
* an,bn the length of a and b respectively.
* dest_db We need the dest_db to run the comparison function.
* compare We need the compare function for the dest_db.
*/
@ -1449,7 +1449,7 @@ static int merge_row_arrays (struct row dest[/*an+bn*/], struct row a[/*an*/], i
* Arguments:
* dest write the rows here
* a,b the rows being merged
* an,bn the lenth of a and b respectively.
* an,bn the length of a and b respectively.
* dest_db We need the dest_db to run the comparison function.
* compare We need the compare function for the dest_db.
*/

2
storage/tokudb/mysql-test/tokudb/t/type_bit.test
View file

@ -268,7 +268,7 @@ select hex(a), b from t1;
drop table t1;
#
# type was not properly initalized, which caused key_copy to fail
# type was not properly initialized, which caused key_copy to fail
#
create table t1(bit_field bit(2), int_field int, key a(bit_field));

2
wsrep/wsrep_api.h
View file

@ -990,7 +990,7 @@ struct wsrep {
void (*stats_free) (wsrep_t* wsrep, struct wsrep_stats_var* var_array);
/*!
* @brief Reset some stats variables to inital value, provider-dependent.
* @brief Reset some stats variables to initial value, provider-dependent.
*
* @param wsrep provider handle.
*/

2
zlib/zlib.h
View file

@ -1440,7 +1440,7 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
provided, but could be inferred from the result of gztell(). This behavior
is the same as the behavior of fread() implementations in common libraries,
but it prevents the direct use of gzfread() to read a concurrently written
file, reseting and retrying on end-of-file, when size is not 1.
file, resetting and retrying on end-of-file, when size is not 1.
*/
ZEXTERN int ZEXPORT gzwrite OF((gzFile file,