Skip to content

Commit

Permalink
Lintian complains on spelling error
Browse files Browse the repository at this point in the history
The lintian check complains on spelling error:
https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
  • Loading branch information
fauust authored and cvicentiu committed Dec 2, 2019
1 parent db32d94 commit 2df2238
Show file tree
Hide file tree
Showing 82 changed files with 110 additions and 110 deletions.
4 changes: 2 additions & 2 deletions client/mysqldump.c
Original file line number Diff line number Diff line change
Expand Up @@ -4548,7 +4548,7 @@ static int dump_databases(char **db_names)


/*
View Specific database initalization.
View Specific database initialization.
SYNOPSIS
init_dumping_views
Expand All @@ -4565,7 +4565,7 @@ int init_dumping_views(char *qdatabase __attribute__((unused)))


/*
Table Specific database initalization.
Table Specific database initialization.
SYNOPSIS
init_dumping_tables
Expand Down
2 changes: 1 addition & 1 deletion debian/additions/innotop/innotop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down
4 changes: 2 additions & 2 deletions extra/innochecksum.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion extra/mariabackup/innobackupex.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion extra/mariabackup/xtrabackup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/src/yassl_error.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/taocrypt/include/error.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions extra/yassl/taocrypt/src/asn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ bool CertDecoder::ConfirmSignature(Source& pub)
}
#endif
else {
source_.SetError(UNKOWN_SIG_E);
source_.SetError(UNKNOWN_SIG_E);
return false;
}

Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/create.result
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/create.test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/mysqld--help.result
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/sp-bugs.result
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/sp-bugs.test
Original file line number Diff line number Diff line change
@@ -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 #

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/sp-security.test
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/type_bit.test
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
12 changes: 6 additions & 6 deletions mysql-test/suite/compat/oracle/r/func_misc.result
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ 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
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
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/funcs_1/views/views_master.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/rpl/r/rpl_mdev-11092.result
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/rpl/t/rpl_mdev-11092.test
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sys_vars/t/ft_boolean_syntax_basic.test
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '# -><()!*:""&|';
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sys_vars/t/init_connect_basic.test
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sys_vars/t/init_slave_basic.test
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sys_vars/t/timestamp_basic.test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pcre/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pcre/doc/html/pcredemo.html
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ <h1>pcredemo man page</h1>
return 1;
}

/* Match succeded */
/* Match succeeded */

printf("\nMatch succeeded at offset %d\n", ovector[0]);

Expand Down Expand Up @@ -379,7 +379,7 @@ <h1>pcredemo man page</h1>
return 1;
}

/* Match succeded */
/* Match succeeded */

printf("\nMatch succeeded again at offset %d\n", ovector[0]);

Expand Down
2 changes: 1 addition & 1 deletion pcre/doc/html/pcrejit.html
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ <h1>pcrejit man page</h1>
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
Expand Down
2 changes: 1 addition & 1 deletion pcre/doc/pcre.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pcre/doc/pcredemo.3
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ if (rc < 0)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\enMatch succeeded at offset %d\en", ovector[0]);
Expand Down Expand Up @@ -379,7 +379,7 @@ for (;;)
return 1;
}
/* Match succeded */
/* Match succeeded */
printf("\enMatch succeeded again at offset %d\en", ovector[0]);
Expand Down
2 changes: 1 addition & 1 deletion pcre/doc/pcrejit.3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pcre/pcre_compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */

Expand Down
2 changes: 1 addition & 1 deletion pcre/pcre_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */

Expand Down
Loading

0 comments on commit 2df2238

Please sign in to comment.