mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #159 from ottok/ok-debpkg-10.0

Browse source 
Fix spelling: occurred, execute, which etc
This commit is contained in:
Sergey Vojtovich 2016-03-07 14:25:02 +04:00
commit 3c37f35f05
126 changed files with 200 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Docs/sp-imp-spec.txt
View file

@ -243,7 +243,7 @@
in the caller's frame is set in the new context as well.
4) For each instruction, call its execute() method.
The result is a pointer to the next instruction to execute (or NULL)
if an error occured.
if an error occurred.
5) On success, set the new values of the OUT and INOUT parameters in
the caller's frame.
@ -853,7 +853,7 @@
// '*nextp' will be set to the index of the next instruction
// to execute. (For most instruction this will be the
// instruction following this one.)
// Returns 0 on success, non-zero if some error occured.
// Returns 0 on success, non-zero if some error occurred.
virtual int execute(THD *, uint *nextp)
}

2
client/mysql.cc
View file

@ -3358,7 +3358,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
end:
/* Show warnings if any or error occured */
/* Show warnings if any or error occurred */
if (show_warnings == 1 && (warnings >= 1 || error))
print_warnings();

2
client/mysql_upgrade.c
View file

@ -644,7 +644,7 @@ static int get_upgrade_info_file_name(char* name)
/*
Read the content of mysql_upgrade_info file and
compare the version number form file against
version number wich mysql_upgrade was compiled for
version number which mysql_upgrade was compiled for
NOTE
This is an optimization to avoid running mysql_upgrade

6
client/mysqltest.cc
View file

@ -1104,7 +1104,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
Run query and dump the result to stderr in vertical format
NOTE! This function should be safe to call when an error
has occured and thus any further errors will be ignored(although logged)
has occurred and thus any further errors will be ignored (although logged)
SYNOPSIS
show_query
@ -1170,7 +1170,7 @@ static void show_query(MYSQL* mysql, const char* query)
is added to the warning stack, only print @@warning_count-1 warnings.
NOTE! This function should be safe to call when an error
has occured and this any further errors will be ignored(although logged)
has occurred and this any further errors will be ignored(although logged)
SYNOPSIS
show_warnings_before_error
@ -4701,7 +4701,7 @@ void do_sync_with_master2(struct st_command *command, long offset,
master_pos_wait returned NULL. This indicates that
slave SQL thread is not started, the slave's master
information is not initialized, the arguments are
incorrect, or an error has occured
incorrect, or an error has occurred
*/
die("%.*s failed: '%s' returned NULL " \
"indicating slave SQL thread failure",

4
debian/additions/innotop/innotop vendored
View file

@ -1503,7 +1503,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' },
@ -10365,7 +10365,7 @@ show you something like this:
pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m
buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo
total_mem_alloc Memory Total memory allocate IB_bp_total_m
add_pool_alloc Add'l Pool Additonal pool alloca IB_bp_add_poo
add_pool_alloc Add'l Pool Additional pool alloca IB_bp_add_poo
The first line shows which table you're editing, and reminds you again to press
'?' for a list of key mappings. The rest is a tabular representation of the

2
debian/additions/innotop/innotop.1 vendored
View file

@ -1579,7 +1579,7 @@ show you something like this:
\& pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m
\& buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo
\& total_mem_alloc Memory Total memory allocate IB_bp_total_m
\& add_pool_alloc Add\*(Aql Pool Additonal pool alloca IB_bp_add_poo
\& add_pool_alloc Add\*(Aql Pool Additional pool alloca IB_bp_add_poo
.Ve
.PP
The first line shows which table you're editing, and reminds you again to press

2
debian/additions/mysqlreport vendored
View file

@ -350,7 +350,7 @@ sub read_relative_infiles
# The infile must begin with the system variable values.
# Therefore, the first occurance of Aborted_clients indicates the beginning
# of the first set of status values if no sets have occured yet ($stat_n == 0).
# of the first set of status values if no sets have occurred yet ($stat_n == 0).
# In this case, the following status values are printed to the current fh,
# along with the system variable values read thus far, until Aborted_clients
# occurs again. Then begins the second and subsequent sets of status values.

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

@ -121,11 +121,11 @@ void SetErrorString(YasslError error, char* buffer)
break;
case certificate_error :
strncpy(buffer, "unable to proccess cerificate", max);
strncpy(buffer, "unable to process cerificate", max);
break;
case privateKey_error :
strncpy(buffer, "unable to proccess private key, bad format", max);
strncpy(buffer, "unable to process private key, bad format", max);
break;
case badVersion_error :

2
include/my_context.h
View file

@ -178,7 +178,7 @@ struct mysql_async_context {
resumed, eg. whether we woke up due to connection completed or timeout
in mysql_real_connect_cont().
*/
unsigned int events_occured;
unsigned int events_occurred;
/*
This is set to the result of the whole asynchronous operation when it
completes. It uses a union, as different calls have different return

2
libmysql/libmysql.c
View file

@ -2232,7 +2232,7 @@ static int stmt_read_row_buffered(MYSQL_STMT *stmt, unsigned char **row)
/*
Read one row from network: unbuffered non-cursor fetch.
If last row was read, or error occured, erase this statement
If last row was read, or error occurred, erase this statement
from record pointing to object unbuffered fetch is performed from.
SYNOPSIS

2
man/mysql-test-run.pl.1
View file

@ -1602,7 +1602,7 @@ may fail in total, as each repetition is considered a new test case, which may i
\fB\-\-retry\-failure=\fR\fB\fIN\fR\fR
.sp
When using the \fB-\-retry\fR option to retry failed tests,
stop when N failures have occured (default 2)\&. Setting it to 0 or 1 effectively turns off retries\&.
stop when N failures have occurred (default 2)\&. Setting it to 0 or 1 effectively turns off retries\&.
.RE
.sp
.RS 4

2
mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
View file

@ -375,7 +375,7 @@ source include/start_slave.inc;
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log");
connection master;
TRUNCATE t1;

2
mysql-test/include/mtr_warnings.sql
View file

@ -136,7 +136,7 @@ INSERT INTO global_suppressions VALUES
("Slave: Query caused different errors on master and slave"),
("Slave: Table .* doesn't exist"),
("Slave: Table width mismatch"),
("Slave: The incident LOST_EVENTS occured on the master"),
("Slave: The incident LOST_EVENTS occurred on the master"),
("Slave: Unknown error.* 1105"),
("Slave: Can't drop database.* database doesn't exist"),
("Time-out in NDB"),

2
mysql-test/lib/My/SafeProcess.pm
View file

@ -34,7 +34,7 @@ package My::SafeProcess;
# will zap the "monitored process" and exit
# - the "monitored process" to exit, in which case it will exit
# itself with same exit code as the "monitored process"
# - the parent process to send the "shutdown" signal in wich case
# - the parent process to send the "shutdown" signal in which case
# monitor will kill the "monitored process" hard and exit
#
#

2
mysql-test/lib/v1/mtr_report.pl
View file

@ -309,7 +309,7 @@ sub mtr_report_stats ($) {
/Slave: Query caused different errors on master and slave/ or
/Slave: Table .* doesn't exist/ or
/Slave: Table width mismatch/ or
/Slave: The incident LOST_EVENTS occured on the master/ or
/Slave: The incident LOST_EVENTS occurred on the master/ or
/Slave: Unknown error.* 1105/ or
/Slave: Can't drop database.* database doesn't exist/ or
/Slave SQL:.*(?:error.* \d+|Query:.*)/ or

2
mysql-test/mysql-test-run.pl
View file

@ -6601,7 +6601,7 @@ Misc options
failures before stopping, set with the --retry-failure
option
retry-failure=N When using the --retry option to retry failed tests,
stop when N failures have occured (default $opt_retry_failure)
stop when N failures have occurred (default $opt_retry_failure)
reorder Reorder tests to get fewer server restarts
help Get this help text

2
mysql-test/r/events_bugs.result
View file

@ -602,7 +602,7 @@ INSERT INTO events_test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp(
ROLLBACK;
END IF;
END;|
Sleep till the first INSERT into events_test.event_log occured
Sleep till the first INSERT into events_test.event_log occurred
SELECT COUNT(*) > 0 AS "Expect 1" FROM events_test.event_log;
Expect 1
1

2
mysql-test/r/index_merge_myisam.result
View file

@ -1595,7 +1595,7 @@ explain select * from t1 where a=10 and b=10 or c=10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge a,b,c a,c 5,5 NULL 54 Using union(a,c); Using where
This will switch to sort-union (intersection will be gone, too,
thats a known limitation:
that's a known limitation:
set optimizer_switch='default,index_merge_union=off';
explain select * from t1 where a=10 and b=10 or c=10;
id select_type table type possible_keys key key_len ref rows Extra

2
mysql-test/r/mysqldump.result
View file

@ -1821,7 +1821,7 @@ a b
Osnabrück Köln
drop table t1;
#
# Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
# Bug#15328 Segmentation fault occurred if my.cnf is invalid for escape sequence
#
--fields-optionally-enclosed-by="
#

2
mysql-test/suite/multi_source/gtid_ignore_duplicates.test
View file

@ -337,7 +337,7 @@ START SLAVE;
--source include/wait_for_slave_to_start.inc
--replace_result $gtid GTID
eval SELECT MASTER_GTID_WAIT("$gtid", 30);
# The bug occured here, the slave would get an out-of-order binlog error
# The bug occurred here, the slave would get an out-of-order binlog error
# due to trying to re-apply the 100-x-x transaction.
# Restart stopped multi-source connections, and sync up.

2
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
View file

@ -1651,7 +1651,7 @@ if($print_details)
--enable_result_log
--horizontal_results
--echo # Dump detailed differences after - before statement execution
--echo # 1. The statement executing connection and hopefully noone else
--echo # 1. The statement executing connection and hopefully no one else
SELECT @default_object_instance_begin;
SELECT EVENT_NAME, OBJECT_INSTANCE_BEGIN,
COUNT_READ, SUM_NUMBER_OF_BYTES_READ,

2
mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
View file

@ -1663,7 +1663,7 @@ if($print_details)
--enable_result_log
--horizontal_results
--echo # Dump detailed differences after - before statement execution
--echo # 1. The statement executing connection and hopefully noone else
--echo # 1. The statement executing connection and hopefully no one else
SELECT @default_object_instance_begin;
SELECT EVENT_NAME, OBJECT_INSTANCE_BEGIN,
COUNT_READ, SUM_NUMBER_OF_BYTES_READ,

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

@ -142,7 +142,7 @@ ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
SET debug_dbug= @old_dbug;
INSERT INTO t4 VALUES (2);
include/wait_for_slave_sql_error.inc [errno=1590]
Last_SQL_Error = 'The incident LOST_EVENTS occured on the master. Message: error writing to the binary log'
Last_SQL_Error = 'The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log'
SELECT * FROM t4 ORDER BY a;
a
1

4
mysql-test/suite/rpl/r/rpl_incident.result
View file

@ -16,9 +16,9 @@ a
2
3
4
call mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master.* 1590");
call mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master.* 1590");
include/wait_for_slave_sql_error.inc [errno=1590]
Last_SQL_Error = 'The incident LOST_EVENTS occured on the master. Message: <none>'
Last_SQL_Error = 'The incident LOST_EVENTS occurred on the master. Message: <none>'
**** On Slave ****
SELECT * FROM t1;
a

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

@ -151,7 +151,7 @@ include/start_slave.inc
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log");
TRUNCATE t1;
SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;

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

@ -152,7 +152,7 @@ include/start_slave.inc
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log");
TRUNCATE t1;
SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;

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

@ -151,7 +151,7 @@ include/start_slave.inc
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master. Message: error writing to the binary log");
TRUNCATE t1;
SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;

2
mysql-test/suite/rpl/t/rpl_checksum.test
View file

@ -298,7 +298,7 @@ if(!$log_error_)
}
--let SEARCH_FILE= $log_error_
--let SEARCH_RANGE=-50000
--let SEARCH_PATTERN= Slave SQL: The incident LOST_EVENTS occured on the master\. Message: error writing to the binary log, Internal MariaDB error code: 1590
--let SEARCH_PATTERN= Slave SQL: The incident LOST_EVENTS occurred on the master\. Message: error writing to the binary log, Internal MariaDB error code: 1590
--source include/search_pattern_in_file.inc
SELECT * FROM t4 ORDER BY a;

2
mysql-test/suite/rpl/t/rpl_gtid_errorlog.test
View file

@ -66,7 +66,7 @@ if(!$log_error_)
--let SEARCH_RANGE=-50000
--let SEARCH_PATTERN=Slave SQL: Error 'Duplicate entry .* on query\. .*Query: '.*', Gtid 0-1-100, Internal MariaDB error code:|Slave SQL: Could not execute Write_rows.*table test.t1; Duplicate entry.*, Gtid 0-1-100, Internal MariaDB error
--source include/search_pattern_in_file.inc
--let SEARCH_PATTERN=Slave SQL: The incident LOST_EVENTS occured on the master\. Message: <none>, Internal MariaDB error code: 1590
--let SEARCH_PATTERN=Slave SQL: The incident LOST_EVENTS occurred on the master\. Message: <none>, Internal MariaDB error code: 1590
--source include/search_pattern_in_file.inc

2
mysql-test/suite/rpl/t/rpl_incident.test
View file

@ -22,7 +22,7 @@ eval SET GLOBAL debug_dbug= '$debug_save';
connection slave;
# Wait until SQL thread stops with error LOST_EVENT on master
call mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master.* 1590");
call mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occurred on the master.* 1590");
let $slave_sql_errno= 1590;
let $show_slave_sql_error= 1;
source include/wait_for_slave_sql_error.inc;

4
mysql-test/suite/stress/include/ddl1.inc
View file

@ -111,10 +111,10 @@
#
# 6. Hints for analysis of test failures:
# 1. Look into the protocol and check in which ddl*.inc
# script the difference to the expected result occured.
# script the difference to the expected result occurred.
# 2. Comment the sourcing of all other ddl*.inc scripts
# out.
# 3. Edit the ddl*.inc script where the error occured and
# 3. Edit the ddl*.inc script where the error occurred and
# remove all
# - "--disable_query_log", "--disable_result_log"
# - successful passed subtests.

2
mysql-test/t/events_bugs.test
View file

@ -943,7 +943,7 @@ DELIMITER ;|
# reasonable time like 4 seconds. Till ~ 2 seconds could pass on a heavy
# loaded testing box before something gets executed).
# Detection of execution is via the records inserted by the event.
--echo Sleep till the first INSERT into events_test.event_log occured
--echo Sleep till the first INSERT into events_test.event_log occurred
let $wait_timeout= 4;
let $wait_condition=
SELECT COUNT(*) > 0 FROM events_test.event_log;

2
mysql-test/t/index_merge_myisam.test
View file

@ -117,7 +117,7 @@ set optimizer_switch='default,index_merge_intersection=off';
explain select * from t1 where a=10 and b=10 or c=10;
--echo This will switch to sort-union (intersection will be gone, too,
--echo thats a known limitation:
--echo that's a known limitation:
set optimizer_switch='default,index_merge_union=off';
explain select * from t1 where a=10 and b=10 or c=10;

2
mysql-test/t/merge.test
View file

@ -655,7 +655,7 @@ insert into t1 values (1);
flush tables;
# Open t2 and (implicitly) t1.
select * from t2;
# Truncate t1, wich was not recognized as open without the bugfix.
# Truncate t1, which was not recognized as open without the bugfix.
# After fix for Bug#8306 and before fix for Bug#26379,
# it should fail with a table-in-use error message, otherwise succeed.
truncate table t1;

2
mysql-test/t/mysqldump.test
View file

@ -701,7 +701,7 @@ drop table t1;
--echo #
--echo # Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
--echo # Bug#15328 Segmentation fault occurred if my.cnf is invalid for escape sequence
--echo #
--exec $MYSQL_MY_PRINT_DEFAULTS --config-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump

2
mysys/mf_iocache2.c
View file

@ -44,7 +44,7 @@
RETURN VALUE
0 All OK
1 An error occured
1 An error occurred
*/
int
my_b_copy_to_file(IO_CACHE *cache, FILE *file)

2
mysys/mf_keycache.c
View file

@ -274,7 +274,7 @@ struct st_hash_link
};
/* simple states of a block */
#define BLOCK_ERROR 1 /* an error occured when performing file i/o */
#define BLOCK_ERROR 1 /* an error occurred when performing file i/o */
#define BLOCK_READ 2 /* file block is in the block buffer */
#define BLOCK_IN_SWITCH 4 /* block is preparing to read new page */
#define BLOCK_REASSIGNED 8 /* blk does not accept requests for old page */

2
mysys/my_default.c
View file

@ -364,7 +364,7 @@ err:
RETURN
0 - ok
1 - error occured
1 - error occurred
*/
static int handle_default_option(void *in_ctx, const char *group_name,

2
mysys/my_delete.c
View file

@ -110,7 +110,7 @@ static int my_win_unlink(const char *name)
if (handle != INVALID_HANDLE_VALUE)
{
/*
We opened file without sharing flags (exclusive), noone else has this file
We opened file without sharing flags (exclusive), no one else has this file
opened, thus it is save to close handle to remove it. No renaming is
necessary.
*/

4
mysys/my_lock.c
View file

@ -131,7 +131,7 @@ error:
RETURN VALUE
0 Success
-1 An error has occured and 'my_errno' is set
-1 An error has occurred and 'my_errno' is set
to indicate the actual error code.
*/
@ -203,7 +203,7 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
== MY_FILEPOS_ERROR)
{
/*
If an error has occured in my_seek then we will already
If an error has occurred in my_seek then we will already
have an error code in my_errno; Just return error code.
*/
DBUG_RETURN(-1);

6
plugin/handler_socket/docs-en/perl-client.en.txt
View file

@ -42,7 +42,7 @@ to be retrieved are specified by the 5th argument for the
corresponding open_index call.
The execute_single method always returns an arrayref. The first
element is the error code, which is 0 when no error is occured.
element is the error code, which is 0 when no error is occurred.
The remaining are the field values. If more than one record is
returned, it is flatten to an 1-dimensional array. For example,
when 5 records that have 3 columns are returned, you can retrieve
@ -125,9 +125,9 @@ methods.
die $hs->get_error() if $res->[0] != 0;
-----------------------------------------------------------------
When an error is occured, the first element of the returned
When an error is occurred, the first element of the returned
arrayref becomes a non-zero value. A negative value indicates
that an I/O error is occured and the Net::HandlerSocket object
that an I/O error is occurred and the Net::HandlerSocket object
should be disposed. A positive value means that the connection is
still active and the Net::HandlerSocket object can be reused
later.

6
plugin/semisync/semisync_master.h
View file

@ -102,7 +102,7 @@ public:
it are in use. A new Block is allocated and is put into the rear of the
Block link table if no Block is free.
@return Return a TranxNode *, or NULL if an error occured.
@return Return a TranxNode *, or NULL if an error occurred.
*/
TranxNode *allocate_node()
{
@ -134,7 +134,7 @@ public:
/**
All nodes are freed.
@return Return 0, or 1 if an error occured.
@return Return 0, or 1 if an error occurred.
*/
int free_all_nodes()
{
@ -150,7 +150,7 @@ public:
@param node All nodes before 'node' will be freed
@return Return 0, or 1 if an error occured.
@return Return 0, or 1 if an error occurred.
*/
int free_nodes_before(TranxNode* node)
{

14
scripts/mysqlaccess.sh
View file

@ -441,7 +441,7 @@ use IPC::Open3;
$DEBUG = 0;
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>8
# Normaly nothing should be changed beneeth this line
# Normally nothing should be changed beneeth this line
# ****************************
@ -2342,7 +2342,7 @@ BEGIN {
."of `$MySQLaccess::script'."
,'Access_denied'
=> "Sorry,\n"
."An error occured when trying to connect to the database\n"
."An error occurred when trying to connect to the database\n"
."with the grant-tables:\n"
."* Maybe YOU do not have READ-access to this database?\n"
."* If you used the -U option, you may have supplied an invalid username?\n"
@ -2352,24 +2352,24 @@ BEGIN {
."* If you used the -P option, you may have supplied an invalid password?\n"
,'Dbaccess_denied'
=> "Sorry,\n"
."An error occured when trying to connect to the database\n"
."An error occurred when trying to connect to the database\n"
."with the grant-tables. (dbaccess denied)\n"
,'Unknown_tmp_table'
=> "Sorry,\n"
."An error occured when trying to work with the temporary tables in the database\n"
."An error occurred when trying to work with the temporary tables in the database\n"
."with the grant-tables. (One of the temporary tables does not exist)\n"
,'Unknown_table'
=> "Sorry,\n"
."An error occured when trying to work with some tables in the database\n"
."An error occurred when trying to work with some tables in the database\n"
."with the grant-tables. (table does not exist)\n"
,'use_old_server'
=> "Sorry,\n"
."An error occured when executing an SQL statement.\n"
."An error occurred when executing an SQL statement.\n"
."You might consider altering the use of the parameter `--old_server' when \n"
."calling `$MySQLaccess::script'."
,'unknown_error'
=> "Sorry,\n"
."An error occured when trying to connect to the database\n"
."An error occurred when trying to connect to the database\n"
."with the grant-tables. (unknown error)\n"
,'anonymous_access'
=> "Accessing the db as an anonymous user.\n"

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

@ -265,7 +265,7 @@ sub fetch_all_rows
if (!($sth= $dbh->prepare($query)))
{
print "\n" if ($opt_debug);
die "Error occured with prepare($query)\n -> $DBI::errstr\n";
die "Error occurred with prepare($query)\n -> $DBI::errstr\n";
return undef;
}
if (!$sth->execute)
@ -282,7 +282,7 @@ sub fetch_all_rows
print "0\n" if ($opt_debug);
return 0;
}
die "Error occured with execute($query)\n -> $DBI::errstr\n";
die "Error occurred with execute($query)\n -> $DBI::errstr\n";
$sth->finish;
return undef;
}

2
sql-common/client_plugin.c
View file

@ -235,7 +235,7 @@ static void load_env_plugins(MYSQL *mysql)
This function must be called before any other client plugin function.
@retval 0 successful
@retval != 0 error occured
@retval != 0 error occurred
*/
int mysql_client_plugin_init()
{

12
sql-common/mysql_async.c
View file

@ -102,7 +102,7 @@ my_connect_async(struct mysql_async_context *b, my_socket fd,
my_context_yield(&b->async_context);
if (b->suspend_resume_hook)
(*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data);
if (b->events_occured & MYSQL_WAIT_TIMEOUT)
if (b->events_occurred & MYSQL_WAIT_TIMEOUT)
return -1;
s_err_size= sizeof(res);
@ -149,7 +149,7 @@ my_recv_async(struct mysql_async_context *b, int fd,
my_context_yield(&b->async_context);
if (b->suspend_resume_hook)
(*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data);
if (b->events_occured & MYSQL_WAIT_TIMEOUT)
if (b->events_occurred & MYSQL_WAIT_TIMEOUT)
return -1;
}
}
@ -177,7 +177,7 @@ my_send_async(struct mysql_async_context *b, int fd,
my_context_yield(&b->async_context);
if (b->suspend_resume_hook)
(*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data);
if (b->events_occured & MYSQL_WAIT_TIMEOUT)
if (b->events_occurred & MYSQL_WAIT_TIMEOUT)
return -1;
}
}
@ -210,7 +210,7 @@ my_io_wait_async(struct mysql_async_context *b, enum enum_vio_io_event event,
my_context_yield(&b->async_context);
if (b->suspend_resume_hook)
(*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data);
return (b->events_occured & MYSQL_WAIT_TIMEOUT) ? 0 : 1;
return (b->events_occurred & MYSQL_WAIT_TIMEOUT) ? 0 : 1;
}
@ -349,7 +349,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql)
} \
\
b->active= 1; \
b->events_occured= ready_status; \
b->events_occurred= ready_status; \
res= my_context_continue(&b->async_context); \
b->active= 0; \
if (res > 0) \
@ -405,7 +405,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql)
} \
\
b->active= 1; \
b->events_occured= ready_status; \
b->events_occurred= ready_status; \
res= my_context_continue(&b->async_context); \
b->active= 0; \
if (res > 0) \

2
sql/event_db_repository.cc
View file

@ -938,7 +938,7 @@ end:
@retval FALSE an event with such db/name key exists
@retval TRUE no record found or an error occured.
@retval TRUE no record found or an error occurred.
*/
bool

2
sql/event_queue.cc
View file

@ -191,7 +191,7 @@ Event_queue::deinit_queue()
@param[out] created set to TRUE if no error and the element is
added to the queue, FALSE otherwise
@retval TRUE an error occured. The value of created is undefined,
@retval TRUE an error occurred. The value of created is undefined,
the element was not deleted.
@retval FALSE success
*/

2
sql/ha_ndbcluster.cc
View file

@ -8123,7 +8123,7 @@ uint8 ha_ndbcluster::table_cache_type()
@param[out] commit_count Commit count for the table.
@return 0 on success.
@return 1 if an error occured.
@return 1 if an error occurred.
*/
uint ndb_get_commitcount(THD *thd, char *norm_name,

2
sql/ha_ndbcluster_binlog.cc
View file

@ -3875,7 +3875,7 @@ restart:
else if (ndb_latest_applied_binlog_epoch > 0)
{
sql_print_warning("NDB Binlog: cluster has reconnected. "
"Changes to the database that occured while "
"Changes to the database that occurred while "
"disconnected will not be in the binlog");
}
if (opt_ndb_extra_logging)

2
sql/ha_partition.cc
View file

@ -8307,7 +8307,7 @@ bool ha_partition::inplace_alter_table(TABLE *altered_table,
/*
Note that this function will try rollback failed ADD INDEX by
executing DROP INDEX for the indexes that were committed (if any)
before the error occured. This means that the underlying storage
before the error occurred. This means that the underlying storage
engine must be able to drop index in-place with X-lock held.
(As X-lock will be held here if new indexes are to be committed)
*/

2
sql/handler.cc
View file

@ -313,7 +313,7 @@ int ha_init_errors(void)
/* Set the dedicated error messages. */
SETMSG(HA_ERR_KEY_NOT_FOUND, ER_DEFAULT(ER_KEY_NOT_FOUND));
SETMSG(HA_ERR_FOUND_DUPP_KEY, ER_DEFAULT(ER_DUP_KEY));
SETMSG(HA_ERR_RECORD_CHANGED, "Update wich is recoverable");
SETMSG(HA_ERR_RECORD_CHANGED, "Update which is recoverable");
SETMSG(HA_ERR_WRONG_INDEX, "Wrong index given to function");
SETMSG(HA_ERR_CRASHED, ER_DEFAULT(ER_NOT_KEYFILE));
SETMSG(HA_ERR_WRONG_IN_RECORD, ER_DEFAULT(ER_CRASHED_ON_USAGE));

2
sql/handler.h
View file

@ -3502,7 +3502,7 @@ public:
*) a) If the previous step succeeds, handler::ha_commit_inplace_alter_table() is
called to allow the storage engine to do any final updates to its structures,
to make all earlier changes durable and visible to other connections.
b) If we have failed to upgrade lock or any errors have occured during the
b) If we have failed to upgrade lock or any errors have occurred during the
handler functions calls (including commit), we call
handler::ha_commit_inplace_alter_table()
to rollback all changes which were done during previous steps.

4
sql/item.cc
View file

@ -4752,7 +4752,7 @@ bool is_outer_table(TABLE_LIST *table, SELECT_LEX *select)
@retval
0 column fully fixed and fix_fields() should return FALSE
@retval
-1 error occured
-1 error occurred
*/
int
@ -6703,7 +6703,7 @@ void Item_field::update_null_value()
UPDATE statement.
RETURN
0 if error occured
0 if error occurred
ref if all conditions are met
this field otherwise
*/

4
sql/item.h
View file

@ -523,7 +523,7 @@ public:
RETURN
FALSE if parameter value has been set,
TRUE if error has occured.
TRUE if error has occurred.
*/
virtual bool set_value(THD *thd, sp_rcontext *ctx, Item **it)= 0;
@ -2513,7 +2513,7 @@ public:
/*
If value for parameter was not set we treat it as non-const
so noone will use parameters value in fix_fields still
so no one will use parameters value in fix_fields still
parameter is constant during execution.
*/
virtual table_map used_tables() const

4
sql/item_func.cc
View file

@ -227,7 +227,7 @@ Item_func::fix_fields(THD *thd, Item **ref)
}
}
fix_length_and_dec();
if (thd->is_error()) // An error inside fix_length_and_dec occured
if (thd->is_error()) // An error inside fix_length_and_dec occurred
return TRUE;
fixed= 1;
return FALSE;
@ -5639,7 +5639,7 @@ void Item_func_get_user_var::fix_length_and_dec()
/*
If the variable didn't exist it has been created as a STRING-type.
'var_entry' is NULL only if there occured an error during the call to
'var_entry' is NULL only if there occurred an error during the call to
get_var_with_binlog.
*/
if (!error && var_entry)

2
sql/item_subselect.cc
View file

@ -5854,7 +5854,7 @@ int subselect_partial_match_engine::exec()
/* Search for a complete match. */
if ((lookup_res= lookup_engine->index_lookup()))
{
/* An error occured during lookup(). */
/* An error occurred during lookup(). */
item_in->value= 0;
item_in->null_value= 0;
return lookup_res;

14
sql/log.cc
View file

@ -628,7 +628,7 @@ void Log_to_csv_event_handler::cleanup()
indicated in the return value.
@retval FALSE OK
@retval TRUE error occured
@retval TRUE error occurred
*/
bool Log_to_csv_event_handler::
@ -793,7 +793,7 @@ err:
RETURN
FALSE - OK
TRUE - error occured
TRUE - error occurred
*/
bool Log_to_csv_event_handler::
@ -1098,7 +1098,7 @@ void Log_to_file_event_handler::flush()
RETURN
FALSE - OK
TRUE - error occured
TRUE - error occurred
*/
bool LOGGER::error_log_print(enum loglevel level, const char *format,
@ -1256,7 +1256,7 @@ bool LOGGER::flush_general_log()
RETURN
FALSE OK
TRUE error occured
TRUE error occurred
*/
bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length,
@ -2752,7 +2752,7 @@ void MYSQL_QUERY_LOG::reopen_file()
RETURN
FASE - OK
TRUE - error occured
TRUE - error occurred
*/
bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host,
@ -2854,7 +2854,7 @@ err:
RETURN
FALSE - OK
TRUE - error occured
TRUE - error occurred
*/
bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
@ -6130,7 +6130,7 @@ binlog_checkpoint_callback(void *cookie)
/*
For every supporting engine, we increment the xid_count and issue a
commit_checkpoint_request(). Then we can count when all
commit_checkpoint_notify() callbacks have occured, and then log a new
commit_checkpoint_notify() callbacks have occurred, and then log a new
binlog checkpoint event.
*/
mysql_bin_log.mark_xids_active(entry->binlog_id, 1);

4
sql/log_event.cc
View file

@ -1348,9 +1348,9 @@ int Log_event::read_log_event(IO_CACHE* file, String* packet,
if (packet->append(file, data_len))
{
/*
Fatal error occured when appending rest of the event
Fatal error occurred when appending rest of the event
to packet, possible failures:
1. EOF occured when reading from file, it's really an error
1. EOF occurred when reading from file, it's really an error
as data_len is >=0 there's supposed to be more bytes available.
file->error will have been set to number of bytes left to read
2. Read was interrupted, file->error would normally be set to -1

4
sql/log_event_old.cc
View file

@ -249,7 +249,7 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, rpl_group_info *rgi)
}
if (error)
{ /* error has occured during the transaction */
{ /* error has occurred during the transaction */
rli->report(ERROR_LEVEL, ev_thd->get_stmt_da()->sql_errno(), NULL,
"Error in %s event: error during transaction execution "
"on table %s.%s. %s",
@ -1690,7 +1690,7 @@ int Old_rows_log_event::do_apply_event(rpl_group_info *rgi)
} // if (table)
if (error)
{ /* error has occured during the transaction */
{ /* error has occurred during the transaction */
rli->report(ERROR_LEVEL, thd->net.last_errno, NULL,
"Error in %s event: error during transaction execution "
"on table %s.%s. %s",

2
sql/my_apc.cc
View file

@ -158,7 +158,7 @@ void init_show_explain_psi_keys(void)
@retval FALSE - Ok, the call has been made
@retval TRUE - Call wasnt made (either the target is in disabled state or
timeout occured)
timeout occurred)
*/
bool Apc_target::make_apc_call(THD *caller_thd, Apc_call *call,

6
sql/rpl_parallel.cc
View file

@ -698,7 +698,7 @@ do_retry:
thd->clear_error();
/*
If we retry due to a deadlock kill that occured during the commit step, we
If we retry due to a deadlock kill that occurred during the commit step, we
might have already updated (but not committed) an update of table
mysql.gtid_slave_pos, and cleared the gtid_pending flag. Now we have
rolled back any such update, so we must set the gtid_pending flag back to
@ -1100,7 +1100,7 @@ handle_rpl_parallel_thread(void *arg)
/*
Register ourself to wait for the previous commit, if we need to do
such registration _and_ that previous commit has not already
occured.
occurred.
*/
register_wait_for_prior_event_group_commit(rgi, entry);
@ -1149,7 +1149,7 @@ handle_rpl_parallel_thread(void *arg)
{
/*
Do an extra check for (deadlock) kill here. This helps prevent a
lingering deadlock kill that occured during normal DML processing to
lingering deadlock kill that occurred during normal DML processing to
propagate past the mark_start_commit(). If we detect a deadlock only
after mark_start_commit(), we have to unmark, which has at least a
theoretical possibility of leaving a window where it looks like all

2
sql/rpl_parallel.h
View file

@ -296,7 +296,7 @@ struct rpl_parallel_entry {
group here. Then later event groups (with higher sub_id) can know not to
try to start (event groups that already started will be rolled back when
wait_for_prior_commit() returns error).
The value is ULONGLONG_MAX when no error occured.
The value is ULONGLONG_MAX when no error occurred.
*/
uint64 stop_on_error_sub_id;
/*

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

@ -6035,7 +6035,7 @@ ER_EVENT_CANNOT_ALTER_IN_THE_PAST
eng "Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future."
ger "Execution Zeitpunkt des Ereignisses in der Vergangenheit liegt, und es war NACH ABSCHLUSS Set nicht erhalten. Die Veranstaltung wurde nicht verändert. Geben Sie einen Zeitpunkt in der Zukunft."
ER_SLAVE_INCIDENT
eng "The incident %s occured on the master. Message: %-.64s"
eng "The incident %s occurred on the master. Message: %-.64s"
ger "Der Vorfall %s passierte auf dem Master. Meldung: %-.64s"
ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT
eng "Table has no partition for some existing values"

2
sql/signal_handler.cc
View file

@ -216,7 +216,7 @@ extern "C" sig_handler handle_fatal_signal(int sig)
if (calling_initgroups)
{
my_safe_printf_stderr("%s", "\n"
"This crash occured while the server was calling initgroups(). This is\n"
"This crash occurred while the server was calling initgroups(). This is\n"
"often due to the use of a mysqld that is statically linked against \n"
"glibc and configured to use LDAP in /etc/nsswitch.conf.\n"
"You will need to either upgrade to a version of glibc that does not\n"

2
sql/sp_head.h
View file

@ -608,7 +608,7 @@ public:
instruction for CONTINUE error handlers.
@retval 0 on success,
@retval other if some error occured
@retval other if some error occurred
*/
virtual int execute(THD *thd, uint *nextp) = 0;

2
sql/sql_acl.cc
View file

@ -9895,7 +9895,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
@return
@retval FALSE Success
@retval TRUE An error occured. Error message not yet sent.
@retval TRUE An error occurred. Error message not yet sent.
*/
bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name,

10
sql/sql_base.cc
View file

@ -8531,7 +8531,7 @@ bool setup_on_expr(THD *thd, TABLE_LIST *table, bool is_update)
TODO
RETURN
TRUE if some error occured (e.g. out of memory)
TRUE if some error occurred (e.g. out of memory)
FALSE if all is OK
*/
@ -8641,7 +8641,7 @@ err_no_arena:
function.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@ -8749,7 +8749,7 @@ err:
record[1] buffers correspond to new and old versions of row respectively.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@ -8805,7 +8805,7 @@ fill_record_n_invoke_before_triggers(THD *thd, TABLE *table, List<Item> &fields,
function.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@ -8897,7 +8897,7 @@ err:
record[1] buffers correspond to new and old versions of row respectively.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/

2
sql/sql_join_cache.cc
View file

@ -2206,7 +2206,7 @@ finish:
for a match for any record from join_tab. To iterate over the candidates
for a match the virtual function get_next_candidate_for_match is used,
while the virtual function prepare_look_for_matches is called to prepare
for such iteration proccess.
for such iteration process.
NOTES
The function produces all matching extensions for the records in the

2
sql/sql_lex.h
View file

@ -590,7 +590,7 @@ public:
global parameters for union
*/
st_select_lex *global_parameters;
//node on wich we should return current_select pointer after parsing subquery
//node on which we should return current_select pointer after parsing subquery
st_select_lex *return_to;
/* LIMIT clause runtime counters */
ha_rows select_limit_cnt, offset_limit_cnt;

2
sql/sql_parse.cc
View file

@ -7306,7 +7306,7 @@ bool st_select_lex_unit::add_fake_select_lex(THD *thd_arg)
@retval
FALSE if all is OK
@retval
TRUE if a memory allocation error occured
TRUE if a memory allocation error occurred
*/
bool

2
sql/sql_prepare.cc
View file

@ -1820,7 +1820,7 @@ static bool mysql_test_create_table(Prepared_statement *stmt)
@note This function handles create view commands.
@retval FALSE Operation was a success.
@retval TRUE An error occured.
@retval TRUE An error occurred.
*/
static bool mysql_test_create_view(Prepared_statement *stmt)

4
sql/sql_repl.cc
View file

@ -3078,7 +3078,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 occured while reseting slave";
const char* errmsg= "Unknown error occurred while reseting slave";
char master_info_file_tmp[FN_REFLEN];
char relay_log_info_file_tmp[FN_REFLEN];
DBUG_ENTER("reset_slave");
@ -3660,7 +3660,7 @@ bool mysql_show_binlog_events(THD* thd)
DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS ||
thd->lex->sql_command == SQLCOM_SHOW_RELAYLOG_EVENTS);
/* select wich binary log to use: binlog or relay */
/* select which binary log to use: binlog or relay */
if ( thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS )
{
/*

8
sql/sql_select.cc
View file

@ -443,7 +443,7 @@ bool handle_select(THD *thd, LEX *lex, select_result *result,
this field from inner subqueries.
@return Status
@retval true An error occured.
@retval true An error occurred.
@retval false OK.
*/
@ -12702,7 +12702,7 @@ static bool check_equality(THD *thd, Item *item, COND_EQUAL *cond_equal,
equality predicates that is equivalent to the conjunction.
Thus, =(a1,a2,a3) can substitute for ((a1=a3) AND (a2=a3) AND (a2=a1)) as
it is equivalent to ((a1=a2) AND (a2=a3)).
The function always makes a substitution of all equality predicates occured
The function always makes a substitution of all equality predicates occurred
in a conjuction for a minimal set of multiple equality predicates.
This set can be considered as a canonical representation of the
sub-conjunction of the equality predicates.
@ -21380,7 +21380,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
select_item= find_item_in_list(order_item, fields, &counter,
REPORT_EXCEPT_NOT_FOUND, &resolution);
if (!select_item)
return TRUE; /* The item is not unique, or some other error occured. */
return TRUE; /* The item is not unique, or some other error occurred. */
/* Check whether the resolved field is not ambiguos. */
@ -24736,7 +24736,7 @@ void JOIN::restore_query_plan(Join_plan_state *restore_from)
@retval REOPT_NEW_PLAN there is a new plan.
@retval REOPT_OLD_PLAN no new improved plan was produced, use the old one.
@retval REOPT_ERROR an irrecovarable error occured during reoptimization.
@retval REOPT_ERROR an irrecovarable error occurred during reoptimization.
*/
JOIN::enum_reopt_result

2
sql/sql_select.h
View file

@ -908,7 +908,7 @@ protected:
enum enum_reopt_result {
REOPT_NEW_PLAN, /* there is a new reoptimized plan */
REOPT_OLD_PLAN, /* no new improved plan can be found, use the old one */
REOPT_ERROR, /* an irrecovarable error occured during reoptimization */
REOPT_ERROR, /* an irrecovarable error occurred during reoptimization */
REOPT_NONE /* not yet reoptimized */
};

4
sql/sql_show.cc
View file

@ -4448,7 +4448,7 @@ uint get_table_open_method(TABLE_LIST *tables,
@retval FALSE No error, if lock was obtained TABLE_LIST::mdl_request::ticket
is set to non-NULL value.
@retval TRUE Some error occured (probably thread was killed).
@retval TRUE Some error occurred (probably thread was killed).
*/
static bool
@ -4556,7 +4556,7 @@ static int fill_schema_table_from_frm(THD *thd, TABLE_LIST *tables,
if (try_acquire_high_prio_shared_mdl_lock(thd, &table_list, can_deadlock))
{
/*
Some error occured (most probably we have been killed while
Some error occurred (most probably we have been killed while
waiting for conflicting locks to go away), let the caller to
handle the situation.
*/

4
sql/sql_string.cc
View file

@ -76,9 +76,9 @@ bool String::real_alloc(uint32 length)
@retval false Either the copy operation is complete or, if the size of the
new buffer is smaller than the currently allocated buffer (if one exists),
no allocation occured.
no allocation occurred.
@retval true An error occured when attempting to allocate memory.
@retval true An error occurred when attempting to allocate memory.
*/
bool String::realloc_raw(uint32 alloc_length)
{

2
sql/sql_trigger.cc
View file

@ -2232,7 +2232,7 @@ void Table_triggers_list::mark_fields_used(trg_event_type event)
/**
Signals to the Table_triggers_list that a parse error has occured when
Signals to the Table_triggers_list that a parse error has occurred when
reading a trigger from file. This makes the Table_triggers_list enter an
error state flagged by m_has_unparseable_trigger == true. The error message
will be used whenever a statement invoking or manipulating triggers is

2
sql/sql_update.cc
View file

@ -2552,7 +2552,7 @@ bool multi_update::send_eof()
if (local_error > 0) // if the above log write did not fail ...
{
/* Safety: If we haven't got an error before (can happen in do_updates) */
my_message(ER_UNKNOWN_ERROR, "An error occured in multi-table update",
my_message(ER_UNKNOWN_ERROR, "An error occurred in multi-table update",
MYF(0));
DBUG_RETURN(TRUE);
}

4
sql/sql_view.cc
View file

@ -245,7 +245,7 @@ fill_defined_view_parts (THD *thd, TABLE_LIST *view)
@param mode VIEW_CREATE_NEW, VIEW_ALTER, VIEW_CREATE_OR_REPLACE
@retval FALSE Operation was a success.
@retval TRUE An error occured.
@retval TRUE An error occurred.
*/
bool create_view_precheck(THD *thd, TABLE_LIST *tables, TABLE_LIST *view,
@ -388,7 +388,7 @@ bool create_view_precheck(THD *thd, TABLE_LIST *tables, TABLE_LIST *view,
@note This function handles both create and alter view commands.
@retval FALSE Operation was a success.
@retval TRUE An error occured.
@retval TRUE An error occurred.
*/
bool mysql_create_view(THD *thd, TABLE_LIST *views,

4
sql/threadpool_win.cc
View file

@ -388,7 +388,7 @@ int start_io(connection_t *connection, PTP_CALLBACK_INSTANCE instance)
return 0;
}
/* Some error occured */
/* Some error occurred */
CancelThreadpoolIo(io);
return -1;
}
@ -575,7 +575,7 @@ static VOID CALLBACK io_completion_callback(PTP_CALLBACK_INSTANCE instance,
return;
error:
/* Some error has occured. */
/* Some error has occurred. */
destroy_connection(connection, instance);
free(connection);

8
sql/tztime.cc
View file

@ -309,7 +309,7 @@ tz_load(const char *name, TIME_ZONE_INFO *sp, MEM_ROOT *storage)
Note: See description of TIME_to_gmt_sec() function first.
In order to perform MYSQL_TIME -> my_time_t conversion we need to build table
which defines "shifted by tz offset and leap seconds my_time_t" ->
my_time_t function wich is almost the same (except ranges of ambiguity)
my_time_t function which is almost the same (except ranges of ambiguity)
as reverse function to piecewise linear function used for my_time_t ->
"shifted my_time_t" conversion and which is also specified as table in
zoneinfo file or in our db (It is specified as start of time type ranges
@ -614,7 +614,7 @@ sec_to_TIME(MYSQL_TIME * tmp, my_time_t t, long offset)
/*
Find time range wich contains given my_time_t value
Find time range which contains given my_time_t value
SYNOPSIS
find_time_range()
@ -710,7 +710,7 @@ find_transition_type(my_time_t t, const TIME_ZONE_INFO *sp)
TODO
We can improve this function by creating joined array of transitions and
leap corrections. This will require adding extra field to TRAN_TYPE_INFO
for storing number of "extra" seconds to minute occured due to correction
for storing number of "extra" seconds to minute occurred due to correction
(60th and 61st second, look how we calculate them as "hit" in this
function).
Under realistic assumptions about frequency of transitions the same array
@ -2763,7 +2763,7 @@ main(int argc, char **argv)
#ifdef TESTTIME
/*
Some simple brute-force test wich allowed to catch a pair of bugs.
Some simple brute-force test which allowed to catch a pair of bugs.
Also can provide interesting facts about system's time zone support
implementation.
*/

2
storage/archive/ha_archive.cc
View file

@ -56,7 +56,7 @@
meta file is first opened it is marked as dirty. It is opened when the table
itself is opened for writing. When the table is closed the new count for rows
is written to the meta file and the file is marked as clean. If the meta file
is opened and it is marked as dirty, it is assumed that a crash occured. At
is opened and it is marked as dirty, it is assumed that a crash occurred. At
this point an error occurs and the user is told to rebuild the file.
A rebuild scans the rows and rewrites the meta file. If corruption is found
in the data file then the meta file is not repaired.

2
storage/connect/plgcnx.h
View file

@ -25,7 +25,7 @@ enum FNRC {RC_LICENSE = 7, /* PLGConnect prompt for license key */
RC_SUCCESS = 0, /* Successful function (must be 0) */
RC_MEMORY = -1, /* Storage allocation error */
RC_TRUNCATED = -2, /* Result has been truncated */
RC_TIMEOUT = -3, /* Connection timeout occured */
RC_TIMEOUT = -3, /* Connection timeout occurred */
RC_TOOBIG = -4, /* Data is too big for connection */
RC_KEY = -5, /* Null ptr to key in Connect */
/* or bad key in other functions */

2
storage/connect/tabdos.cpp
View file

@ -184,7 +184,7 @@ bool DOSDEF::GetOptFileName(PGLOBAL g, char *filename)
} // end of GetOptFileName
/***********************************************************************/
/* After an optimize error occured, remove all set optimize values. */
/* After an optimize error occurred, remove all set optimize values. */
/***********************************************************************/
void DOSDEF::RemoveOptValues(PGLOBAL g)
{

2
storage/connect/tabmysql.cpp
View file

@ -806,7 +806,7 @@ int TDBMYSQL::GetMaxSize(PGLOBAL g)
else if (!Cardinality(NULL))
MaxSize = 10; // To make MySQL happy
else if ((MaxSize = Cardinality(g)) < 0)
MaxSize = 12; // So we can see an error occured
MaxSize = 12; // So we can see an error occurred
} // endif MaxSize

2
storage/connect/tabodbc.cpp
View file

@ -818,7 +818,7 @@ int TDBODBC::GetMaxSize(PGLOBAL g)
else if (!Cardinality(NULL))
MaxSize = 10; // To make MySQL happy
else if ((MaxSize = Cardinality(g)) < 0)
MaxSize = 12; // So we can see an error occured
MaxSize = 12; // So we can see an error occurred
} // endif MaxSize

4
storage/connect/value.cpp
View file

@ -989,7 +989,7 @@ uchar TYPVAL<uchar>::MinMaxVal(bool b)
{return (b) ? UINT_MAX8 : 0;}
/***********************************************************************/
/* SafeAdd: adds a value and test whether overflow/underflow occured. */
/* SafeAdd: adds a value and test whether overflow/underflow occurred. */
/***********************************************************************/
template <class TYPE>
TYPE TYPVAL<TYPE>::SafeAdd(TYPE n1, TYPE n2)
@ -1017,7 +1017,7 @@ inline double TYPVAL<double>::SafeAdd(double n1, double n2)
} // end of SafeAdd
/***********************************************************************/
/* SafeMult: multiply values and test whether overflow occured. */
/* SafeMult: multiply values and test whether overflow occurred. */
/***********************************************************************/
template <class TYPE>
TYPE TYPVAL<TYPE>::SafeMult(TYPE n1, TYPE n2)

2
storage/csv/ha_tina.h
View file

@ -71,7 +71,7 @@ class ha_tina: public handler
File update_temp_file;
String buffer;
/*
The chain contains "holes" in the file, occured because of
The chain contains "holes" in the file, occurred because of
deletes/updates. It is used in rnd_end() to get rid of them
in the end of the query.
*/

2
storage/federated/ha_federated.cc
View file

@ -2016,7 +2016,7 @@ void ha_federated::start_bulk_insert(ha_rows rows, uint flags)
@return Operation status
@retval 0 No error
@retval != 0 Error occured at remote server. Also sets my_errno.
@retval != 0 Error occurred at remote server. Also sets my_errno.
*/
int ha_federated::end_bulk_insert()

2
storage/federatedx/ha_federatedx.cc
View file

@ -2157,7 +2157,7 @@ void ha_federatedx::start_bulk_insert(ha_rows rows, uint flags)
@return Operation status
@retval 0 No error
@retval != 0 Error occured at remote server. Also sets my_errno.
@retval != 0 Error occurred at remote server. Also sets my_errno.
*/
int ha_federatedx::end_bulk_insert()

2
storage/innobase/fts/fts0opt.cc
View file

@ -598,7 +598,7 @@ fts_zip_read_word(
/* Finished decompressing block. */
if (zip->zp->avail_in == 0) {
/* Free the block thats been decompressed. */
/* Free the block that's been decompressed. */
if (zip->pos > 0) {
ulint prev = zip->pos - 1;

4
storage/innobase/os/os0file.cc
View file

@ -2677,7 +2677,7 @@ try_again:
"Error in system call pread(). The operating"
" system error number is %lu.",(ulint) errno);
} else {
/* Partial read occured */
/* Partial read occurred */
ib_logf(IB_LOG_LEVEL_ERROR,
"Tried to read " ULINTPF " bytes at offset "
UINT64PF ". Was only able to read %ld.",
@ -2808,7 +2808,7 @@ try_again:
"Error in system call pread(). The operating"
" system error number is %lu.",(ulint) errno);
} else {
/* Partial read occured */
/* Partial read occurred */
ib_logf(IB_LOG_LEVEL_ERROR,
"Tried to read " ULINTPF " bytes at offset "
UINT64PF ". Was only able to read %ld.",

2
storage/maria/ma_packrec.c
View file

@ -1204,7 +1204,7 @@ static void decode_bytes(MARIA_COLUMNDEF *rec,MARIA_BIT_BUFF *bit_buff,
/* This means that the Huffman code must be longer than table_bits. */
pos=decode_tree->table+low_byte;
bits-=table_bits;
/* NOTE: decode_bytes_test_bit() is a macro wich contains a break !!! */
/* NOTE: decode_bytes_test_bit() is a macro which contains a break !!! */
for (;;)
{
low_byte=(uint) (bit_buff->current_byte >> (bits-8));

2
storage/myisam/ha_myisam.cc
View file

@ -2405,7 +2405,7 @@ maria_declare_plugin_end;
@return The error code. The engine_data and engine_callback will be set to 0.
@retval TRUE Success
@retval FALSE An error occured
@retval FALSE An error occurred
*/
my_bool ha_myisam::register_query_cache_table(THD *thd, char *table_name,

2
storage/myisam/mi_packrec.c
View file

@ -1158,7 +1158,7 @@ static void decode_bytes(MI_COLUMNDEF *rec,MI_BIT_BUFF *bit_buff,uchar *to,
/* This means that the Huffman code must be longer than table_bits. */
pos=decode_tree->table+low_byte;
bits-=table_bits;
/* NOTE: decode_bytes_test_bit() is a macro wich contains a break !!! */
/* NOTE: decode_bytes_test_bit() is a macro which contains a break !!! */
for (;;)
{
low_byte=(uint) (bit_buff->current_byte >> (bits-8));

2
storage/myisam/myisamlog.c
View file

@ -266,7 +266,7 @@ static void get_options(register int *argc, register char ***argv)
puts(" -u \"update\" -v \"verbose\" -w \"write file\"");
puts(" -D \"myisam compiled with DBUG\" -P \"processes\"");
puts("\nOne can give a second and a third '-v' for more verbose.");
puts("Normaly one does a update (-u).");
puts("Normally one does a update (-u).");
puts("If a recover is done all writes and all possibly updates and deletes is done\nand errors are only counted.");
puts("If one gives table names as arguments only these tables will be updated\n");
help=1;

6
storage/ndb/include/ndbapi/NdbEventOperation.hpp
View file

@ -34,7 +34,7 @@ class NdbEventOperationImpl;
* Ndb::createEventOperation()
* - execute() starts the event flow. Use Ndb::pollEvents() to wait
* for an event to occur. Use Ndb::nextEvent() to iterate
* through the events that have occured.
* through the events that have occurred.
* - The instance is removed by Ndb::dropEventOperation()
*
* For more info see:
@ -63,7 +63,7 @@ class NdbEventOperationImpl;
* - Event code does not check table schema version. Make sure to drop events
* after table is dropped. Will be fixed in later
* versions.
* - If a node failure has occured not all events will be recieved
* - If a node failure has occurred not all events will be recieved
* anymore. Drop NdbEventOperation and Create again after nodes are up
* again. Will be fixed in later versions.
*
@ -167,7 +167,7 @@ public:
bool isConsistent() const;
/**
* Query for occured event type.
* Query for occurred event type.
*
* @note Only valid after Ndb::nextEvent() has been called and
* returned a not NULL value

4
storage/ndb/include/ndbapi/NdbOperation.hpp
View file

@ -761,9 +761,9 @@ public:
const NdbError & getNdbError() const;
/**
* Get the method number where the error occured.
* Get the method number where the error occurred.
*
* @return method number where the error occured.
* @return method number where the error occurred.
*/
int getNdbErrorLine();

4
storage/ndb/include/ndbapi/NdbTransaction.hpp
View file

@ -521,9 +521,9 @@ public:
NdbOperation* getNdbErrorOperation();
/**
* Get the method number where the latest error occured.
* Get the method number where the latest error occurred.
*
* @return Line number where latest error occured.
* @return Line number where latest error occurred.
*/
int getNdbErrorLine();

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