diff options
39 files changed, 59 insertions, 59 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index be1d222eb07..9486bd3ebb7 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -111,7 +111,7 @@ enum enum_server_command #define MYSQL_TYPE_VIRTUAL 245 /* Length of random string sent by server on handshake; this is also length of - obfuscated password, recieved from client + obfuscated password, received from client */ #define SCRAMBLE_LENGTH 20 #define SCRAMBLE_LENGTH_323 8 diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 9985fa2233c..0517be9bdee 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -81,7 +81,7 @@ const char *client_errors[]= "Attempt to read a row while there is no result set associated with the statement", "This feature is not implemented yet", "Lost connection to MySQL server at '%s', system error: %M", - "Statement closed indirectly because of a preceeding %s() call", + "Statement closed indirectly because of a preceding %s() call", "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again", "This handle is already connected. Use a separate handle for each connection.", "Authentication plugin '%s' cannot be loaded: %s", diff --git a/man/mysql-test-run.pl.1 b/man/mysql-test-run.pl.1 index ebf17746b68..20abc250b15 100644 --- a/man/mysql-test-run.pl.1 +++ b/man/mysql-test-run.pl.1 @@ -332,7 +332,7 @@ is defined so that can invoke itself with exec $MYSQL_TEST\&. .PP -Other tests may refer to the last three variables listed in the preceeding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in +Other tests may refer to the last three variables listed in the preceding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in $MYSQL_TMP_DIR/\fIfile_name\fR\&. .PP If you are running diff --git a/mysql-test/collections/default.weekly b/mysql-test/collections/default.weekly index a03e2593cfe..a03e2593cfe 100755..100644 --- a/mysql-test/collections/default.weekly +++ b/mysql-test/collections/default.weekly diff --git a/mysql-test/extra/rpl_tests/rpl_ddl.test b/mysql-test/extra/rpl_tests/rpl_ddl.test index 32fc10479b8..8c35ff974d8 100644 --- a/mysql-test/extra/rpl_tests/rpl_ddl.test +++ b/mysql-test/extra/rpl_tests/rpl_ddl.test @@ -98,8 +98,8 @@ # --> less switching of AUTOCOMMIT mode on master side. # # 4. Never use a test object, which was direct or indirect affected by a -# preceeding test sequence again. -# If one preceeding test sequence hits a (sometimes not visible, +# preceding test sequence again. +# If one preceding test sequence hits a (sometimes not visible, # because the sql error code of the statement might be 0) bug # and these rules are ignored, a following test sequence might earn ugly # effects like failing 'sync_slave_with_master', crashes of the slave or diff --git a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/extra/rpl_tests/rpl_row_basic.test index f2ef0eda4f5..8ce45505c46 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test +++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test @@ -221,7 +221,7 @@ INSERT INTO t7 VALUES (1,3), (2,6), (3,9); SELECT * FROM t7 ORDER BY C1; # since bug#31552/31609 idempotency is not default any longer. In order -# the preceeding test INSERT INTO t7 to pass the mode is switched +# the preceding test INSERT INTO t7 to pass the mode is switched # temprorarily set @@global.slave_exec_mode= 'IDEMPOTENT'; @@ -260,7 +260,7 @@ INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9); SELECT * FROM t8 ORDER BY a; # since bug#31552/31609 idempotency is not default any longer. In order -# the preceeding test INSERT INTO t8 to pass the mode is switched +# the preceding test INSERT INTO t8 to pass the mode is switched # temprorarily set @@global.slave_exec_mode= 'IDEMPOTENT'; diff --git a/mysql-test/include/wait_until_count_sessions.inc b/mysql-test/include/wait_until_count_sessions.inc index 26b0d8f2633..245fb68b5c3 100644 --- a/mysql-test/include/wait_until_count_sessions.inc +++ b/mysql-test/include/wait_until_count_sessions.inc @@ -10,7 +10,7 @@ # 1. We wait for $current_sessions <= $count_sessions because in the use case # with count_sessions.inc before and wait_until_count_sessions.inc after # the core of the test it could happen that the disconnects of sessions -# belonging to the preceeding test are not finished. +# belonging to the preceding test are not finished. # sessions at test begin($count_sessions) = m + n # sessions of the previous test which will be soon disconnected = n (n >= 0) # sessions at test end ($current sessions, assuming the test disconnects diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 75cb0154153..e8c41fd7b23 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -6525,7 +6525,7 @@ Misc options start-dirty Only start the servers (without initialization) for the first specified test case user-args In combination with start* and no test name, drops - arguments to mysqld except those speficied with + arguments to mysqld except those specified with --mysqld (if any) wait-all If --start or --start-dirty option is used, wait for all servers to exit before finishing the process diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 47e1851c4ef..822d4eb9ce1 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -683,7 +683,7 @@ The following options may be given as the first argument: plugins from a given library_file will be loaded. --plugin-load-add=name Optional semicolon-separated list of plugins to load. - This option adds to the list speficied by --plugin-load + This option adds to the list specified by --plugin-load in an incremental way. It can be specified many times, adding more plugins every time. --plugin-maturity=name @@ -756,7 +756,7 @@ The following options may be given as the first argument: --relay-log-space-limit=# Maximum space to use for all relay logs --replicate-annotate-row-events - Tells the slave to write annotate rows events recieved + Tells the slave to write annotate rows events received from the master to its own binary log. Ignored if log_slave_updates is not set --replicate-do-db=name diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index ec680b112a3..31fcea528aa 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -613,8 +613,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"), ("4", "1", "sup", "0"); create table t3 ( id int(11) not null default '0', -preceeding_id int(11) not null default '0', -primary key (id,preceeding_id) +preceding_id int(11) not null default '0', +primary key (id,preceding_id) ); create table t4 ( user_id varchar(50) not null, @@ -625,7 +625,7 @@ insert into t4 values("nicke", "imp"); prepare stmt from 'select distinct t1.partner_id from t1 left join t3 on t1.id = t3.id - left join t1 pp on pp.id = t3.preceeding_id + left join t1 pp on pp.id = t3.preceding_id where exists ( select * diff --git a/mysql-test/r/subselect_sj.result b/mysql-test/r/subselect_sj.result index c76d40d1a5f..6c736aad8ee 100644 --- a/mysql-test/r/subselect_sj.result +++ b/mysql-test/r/subselect_sj.result @@ -1007,8 +1007,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"), ("4", "1", "sup", "0"); create table t3 ( id int(11) not null default '0', -preceeding_id int(11) not null default '0', -primary key (id,preceeding_id) +preceding_id int(11) not null default '0', +primary key (id,preceding_id) ); create table t4 ( user_id varchar(50) not null, diff --git a/mysql-test/r/subselect_sj_jcl6.result b/mysql-test/r/subselect_sj_jcl6.result index 92ad951325b..dce77b68cdc 100644 --- a/mysql-test/r/subselect_sj_jcl6.result +++ b/mysql-test/r/subselect_sj_jcl6.result @@ -1020,8 +1020,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"), ("4", "1", "sup", "0"); create table t3 ( id int(11) not null default '0', -preceeding_id int(11) not null default '0', -primary key (id,preceeding_id) +preceding_id int(11) not null default '0', +primary key (id,preceding_id) ); create table t4 ( user_id varchar(50) not null, diff --git a/mysql-test/suite/funcs_1/views/func_view.inc b/mysql-test/suite/funcs_1/views/func_view.inc index c26f21945c3..1f0b0ac52a7 100644 --- a/mysql-test/suite/funcs_1/views/func_view.inc +++ b/mysql-test/suite/funcs_1/views/func_view.inc @@ -284,7 +284,7 @@ INSERT INTO t1_values SET # other interesting value # numbers -> 0 # strings, blobs, binaries -> not full length of used data type, "exotic" -# characters and preceeding and trailing spaces +# characters and preceding and trailing spaces # FIXME enum, set ?? INSERT INTO t1_values SET my_char_30 = ' ---äÖüß@µ*$-- ', diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc index 48996a6c1a3..1743bace705 100644 --- a/mysql-test/suite/funcs_1/views/views_master.inc +++ b/mysql-test/suite/funcs_1/views/views_master.inc @@ -545,7 +545,7 @@ let $message= Testcase 3.3.1.7 ; # view names are accepted, at creation time, alteration time, # and drop time. ############################################################################### -# Note(mleich): non-qualified view name means a view name without preceeding +# Note(mleich): non-qualified view name means a view name without preceding # database name --disable_warnings DROP VIEW IF EXISTS v1 ; diff --git a/mysql-test/suite/rpl/t/rpl_ddl.test b/mysql-test/suite/rpl/t/rpl_ddl.test index f9a353f87ac..89ae2c03242 100644 --- a/mysql-test/suite/rpl/t/rpl_ddl.test +++ b/mysql-test/suite/rpl/t/rpl_ddl.test @@ -13,10 +13,10 @@ # sequences start. # # 2. Never use a test object, which was direct or indirect affected by a -# preceeding test sequence again. +# preceding test sequence again. # Except table d1.t1 where ONLY DML is allowed. # -# If one preceeding test sequence hits a (sometimes not good visible, +# If one preceding test sequence hits a (sometimes not good visible, # because the sql error code of the statement might be 0) bug # and these rules are ignored, a following test sequence might earn ugly # effects like failing 'sync_slave_with_master', crashes of the slave or diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test index b88001e6a9f..9e99c1eb0b3 100644 --- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test +++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test @@ -244,7 +244,7 @@ sync_slave_with_master; UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1; SELECT * FROM t1 ORDER BY a; # since bug#31552/31609 idempotency is not default any longer. In -# order for the preceeding test UPDATE t1 to pass, the mode is switched +# order for the preceding test UPDATE t1 to pass, the mode is switched # temprorarily set @@global.slave_exec_mode= 'IDEMPOTENT'; --echo **** On Master **** diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 9775a8dc28e..0233b2e428b 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -677,8 +677,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"), create table t3 ( id int(11) not null default '0', - preceeding_id int(11) not null default '0', - primary key (id,preceeding_id) + preceding_id int(11) not null default '0', + primary key (id,preceding_id) ); create table t4 ( @@ -692,7 +692,7 @@ insert into t4 values("nicke", "imp"); prepare stmt from 'select distinct t1.partner_id from t1 left join t3 on t1.id = t3.id - left join t1 pp on pp.id = t3.preceeding_id + left join t1 pp on pp.id = t3.preceding_id where exists ( select * diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test index 1b0076fd1e6..4003b9c5ff8 100644 --- a/mysql-test/t/subselect_sj.test +++ b/mysql-test/t/subselect_sj.test @@ -897,8 +897,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"), ("4", "1", "sup", "0"); create table t3 ( id int(11) not null default '0', - preceeding_id int(11) not null default '0', - primary key (id,preceeding_id) + preceding_id int(11) not null default '0', + primary key (id,preceding_id) ); create table t4 ( diff --git a/sql/handler.h b/sql/handler.h index 49e18facdb7..5bba570f8ec 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1610,7 +1610,7 @@ struct HA_CREATE_INFO For ALTER TABLE defaults to ROW_TYPE_NOT_USED (means "keep the current"). Can be changed either explicitly by the parser. - If nothing speficied inherits the value of the original table (if present). + If nothing specified inherits the value of the original table (if present). */ enum row_type row_type; enum ha_choice transactional; diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index 30db7e635e2..759b929ff82 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -2899,7 +2899,7 @@ bool Item_func_xml_update::collect_result(String *str, str->length(0); str->set_charset(collation.collation); return - /* Put the XML part preceeding the replaced piece */ + /* Put the XML part preceding the replaced piece */ str->append(xml.raw()->ptr(), cut->beg - xml.raw()->ptr() - offs) || /* Put the replacement */ str->append(replace->ptr(), replace->length()) || diff --git a/sql/log_event.cc b/sql/log_event.cc index f5dfbe221aa..9846bade696 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -4087,7 +4087,7 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi, if ((error= rows_event_stmt_cleanup(rgi, thd))) { const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error, - "Error in cleaning up after an event preceeding the commit; " + "Error in cleaning up after an event preceding the commit; " "the group log file/position: %s %s", const_cast<Relay_log_info*>(rli)->group_master_log_name, llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos, diff --git a/sql/log_event.h b/sql/log_event.h index 020af59ae81..2091d968558 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2004,7 +2004,7 @@ public: bool is_valid() const { return query != 0; } /* - Returns number of bytes additionaly written to post header by derived + Returns number of bytes additionally written to post header by derived events (so far it is only Execute_load_query event). */ virtual ulong get_post_header_size_for_derived() { return 0; } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d86a1743468..90d6659cdcf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7097,7 +7097,7 @@ struct my_option my_long_options[]= GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"plugin-load-add", OPT_PLUGIN_LOAD_ADD, "Optional semicolon-separated list of plugins to load. This option adds " - "to the list speficied by --plugin-load in an incremental way. " + "to the list specified by --plugin-load in an incremental way. " "It can be specified many times, adding more plugins every time.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, diff --git a/sql/password.c b/sql/password.c index 7a3d8aafde3..37d06136d80 100644 --- a/sql/password.c +++ b/sql/password.c @@ -442,7 +442,7 @@ void make_scrambled_password(char *to, const char *password) /* Produce an obscure octet sequence from password and random - string, recieved from the server. This sequence corresponds to the + string, received from the server. This sequence corresponds to the password, but password can not be easily restored from it. The sequence is then sent to the server for validation. Trailing zero is not stored in the buf as it is not needed. @@ -476,7 +476,7 @@ scramble(char *to, const char *message, const char *password) /* Check that scrambled message corresponds to the password; the function - is used by server to check that recieved reply is authentic. + is used by server to check that received reply is authentic. This function does not check lengths of given strings: message must be null-terminated, reply and hash_stage2 must be at least SHA1_HASH_SIZE long (if not, something fishy is going on). diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index fcb6a849fb1..05227a29775 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -1229,7 +1229,7 @@ bool Deferred_log_events::execute(rpl_group_info *rgi) void Deferred_log_events::rewind() { /* - Reset preceeding Query log event events which execution was + Reset preceding Query log event events which execution was deferred because of slave side filtering. */ if (!is_empty()) diff --git a/sql/slave.cc b/sql/slave.cc index a40e5735b24..f7d019a6c39 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4427,7 +4427,7 @@ pthread_handler_t handle_slave_sql(void *arg) /* binlog_annotate_row_events must be TRUE only after an Annotate_rows event - has been recieved and only till the last corresponding rbr event has been + has been received and only till the last corresponding rbr event has been applied. In all other cases it must be FALSE. */ thd->variables.binlog_annotate_row_events= 0; diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 1c4449ef7c2..433f3303ad7 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -715,7 +715,7 @@ static void update_global_user_stats_with_user(THD *thd, user_stats->cpu_time+= (thd->status_var.cpu_time - thd->org_status_var.cpu_time); /* - This is handle specially as bytes_recieved is incremented BEFORE + This is handle specially as bytes_received is incremented BEFORE org_status_var is copied. */ user_stats->bytes_received+= (thd->org_status_var.bytes_received- diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 6ca4015adb4..ebceae70ee5 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -74,7 +74,7 @@ When one supplies long data for a placeholder: - Server gets the long data in pieces with command type 'COM_STMT_SEND_LONG_DATA'. - - The packet recieved will have the format as: + - The packet received will have the format as: [COM_STMT_SEND_LONG_DATA:1][STMT_ID:4][parameter_number:2][data] - data from the packet is appended to the long data value buffer for this placeholder. diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b97cedb5b05..b88aed1f1bb 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -21094,7 +21094,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables, Item *view_ref= NULL; /* If we have found field not by its alias in select list but by its - original field name, we should additionaly check if we have conflict + original field name, we should additionally check if we have conflict for this name (in case if we would perform lookup in all tables). */ if (resolution == RESOLVED_BEHIND_ALIAS && !order_item->fixed && @@ -22117,7 +22117,7 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array, We are replacing the argument of Item_func_set_user_var after its value has been read. The argument's null_value should be set by now, so we must set it explicitly for the replacement argument since the null_value - may be read without any preceeding call to val_*(). + may be read without any preceding call to val_*(). */ new_field->update_null_value(); List<Item> list; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 9ea72676b13..d6b3fa41c78 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -14535,7 +14535,7 @@ opt_var_ident_type: | SESSION_SYM '.' { $$=OPT_SESSION; } ; -// Option values with preceeding option_type. +// Option values with preceding option_type. option_value_following_option_type: internal_variable_name equal set_expr_or_default { @@ -14551,7 +14551,7 @@ option_value_following_option_type: { /* Not in trigger assigning value to new row, - and option_type preceeding local variable is illegal. + and option_type preceding local variable is illegal. */ my_parse_error(ER(ER_SYNTAX_ERROR)); MYSQL_YYABORT; @@ -14559,7 +14559,7 @@ option_value_following_option_type: } ; -// Option values without preceeding option_type. +// Option values without preceding option_type. option_value_no_option_type: internal_variable_name equal set_expr_or_default { diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index b772c82ef52..bb4b7f6da01 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -4664,7 +4664,7 @@ static Sys_var_mybool Sys_binlog_annotate_row_events( #ifdef HAVE_REPLICATION static Sys_var_mybool Sys_replicate_annotate_row_events( "replicate_annotate_row_events", - "Tells the slave to write annotate rows events recieved from the master " + "Tells the slave to write annotate rows events received from the master " "to its own binary log. Ignored if log_slave_updates is not set", READ_ONLY GLOBAL_VAR(opt_replicate_annotate_row_events), CMD_LINE(OPT_ARG), DEFAULT(0)); diff --git a/sql/tztime.cc b/sql/tztime.cc index b0c5a0830fc..d3b4fec6335 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2033,7 +2033,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables) /* At last we are doing the same thing for records in - mysql.time_zone_transition table. Here we additionaly need records + mysql.time_zone_transition table. Here we additionally need records in ascending order by index scan also satisfies us. */ table= tz_tables->table; diff --git a/storage/connect/filamap.cpp b/storage/connect/filamap.cpp index f8a4e7d2f2b..1723ee4ac27 100644 --- a/storage/connect/filamap.cpp +++ b/storage/connect/filamap.cpp @@ -382,7 +382,7 @@ int MAPFAM::DeleteRecords(PGLOBAL g, int irc) if (Tpos == Spos) /*******************************************************************/ - /* First line to delete. Move of eventual preceeding lines is */ + /* First line to delete. Move of eventual preceding lines is */ /* not required here, just setting of future Spos and Tpos. */ /*******************************************************************/ Tpos = Fpos; // Spos is set below diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp index a64d7bdc04d..9338ae322db 100644 --- a/storage/connect/filamfix.cpp +++ b/storage/connect/filamfix.cpp @@ -367,7 +367,7 @@ int FIXFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* Move of eventual preceeding lines is not required here. */ + /* Move of eventual preceding lines is not required here. */ /* Set the target file as being the source file itself. */ /* Set the future Tpos, and give Spos a value to block moving. */ /*****************************************************************/ @@ -1165,7 +1165,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc) if (Tpos == Spos) { /*******************************************************************/ - /* First line to delete. Move of eventual preceeding lines is */ + /* First line to delete. Move of eventual preceding lines is */ /* not required here if a temporary file is not used, just the */ /* setting of future Spos and Tpos. */ /*******************************************************************/ @@ -1178,7 +1178,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* Move of eventual preceeding lines is not required here. */ + /* Move of eventual preceding lines is not required here. */ /* Set the target file as being the source file itself. */ /* Set the future Tpos, and give Spos a value to block copying. */ /*****************************************************************/ diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp index ecd255afd2e..e4e9130dc86 100644 --- a/storage/connect/filamtxt.cpp +++ b/storage/connect/filamtxt.cpp @@ -714,7 +714,7 @@ int DOSFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* Move of eventual preceeding lines is not required here. */ + /* Move of eventual preceding lines is not required here. */ /* Set the target file as being the source file itself. */ /* Set the future Tpos, and give Spos a value to block copying. */ /*****************************************************************/ diff --git a/storage/connect/filamvct.cpp b/storage/connect/filamvct.cpp index 97eb4c7c8b4..1957c7f29ac 100755 --- a/storage/connect/filamvct.cpp +++ b/storage/connect/filamvct.cpp @@ -712,7 +712,7 @@ int VCTFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* First line to delete. Move of eventual preceeding lines is */ + /* First line to delete. Move of eventual preceding lines is */ /* not required here, just the setting of future Spos and Tpos. */ /*****************************************************************/ T_Stream = Stream; @@ -1558,7 +1558,7 @@ int VCMFAM::DeleteRecords(PGLOBAL g, int irc) if (Tpos == Spos) /*******************************************************************/ - /* First line to delete. Move of eventual preceeding lines is */ + /* First line to delete. Move of eventual preceding lines is */ /* not required here, just setting of future Spos and Tpos. */ /*******************************************************************/ Tpos = Fpos; // Spos is set below @@ -2153,7 +2153,7 @@ int VECFAM::DeleteRecords(PGLOBAL g, int irc) } else /*****************************************************************/ - /* Move of eventual preceeding lines is not required here. */ + /* Move of eventual preceding lines is not required here. */ /* Set the future Tpos, and give Spos a value to block copying. */ /*****************************************************************/ Spos = Tpos = Fpos; @@ -2834,7 +2834,7 @@ int VMPFAM::DeleteRecords(PGLOBAL g, int irc) if (Tpos == Spos) /*******************************************************************/ - /* First line to delete. Move of eventual preceeding lines is */ + /* First line to delete. Move of eventual preceding lines is */ /* not required here, just setting of future Spos and Tpos. */ /*******************************************************************/ Tpos = Fpos; // Spos is set below @@ -3756,7 +3756,7 @@ int BGVFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* Move of eventual preceeding lines is not required here. */ + /* Move of eventual preceding lines is not required here. */ /* Set the target file as being the source file itself. */ /* Set the future Tpos, and give Spos a value to block copying. */ /*****************************************************************/ diff --git a/storage/maria/ma_rnext.c b/storage/maria/ma_rnext.c index d3fab041d75..b4c1692d77d 100644 --- a/storage/maria/ma_rnext.c +++ b/storage/maria/ma_rnext.c @@ -71,7 +71,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx) Normally SQL layer would never request "search next" if "search first" failed. But HANDLER may do anything. - As mi_rnext() without preceeding mi_rkey()/mi_rfirst() + As mi_rnext() without preceding mi_rkey()/mi_rfirst() equals to mi_rfirst(), we must restore original state as if failing mi_rfirst() was not called. */ diff --git a/storage/myisam/mi_rnext.c b/storage/myisam/mi_rnext.c index ee5c74f8da1..509cd75fbab 100644 --- a/storage/myisam/mi_rnext.c +++ b/storage/myisam/mi_rnext.c @@ -66,7 +66,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx) Normally SQL layer would never request "search next" if "search first" failed. But HANDLER may do anything. - As mi_rnext() without preceeding mi_rkey()/mi_rfirst() + As mi_rnext() without preceding mi_rkey()/mi_rfirst() equals to mi_rfirst(), we must restore original state as if failing mi_rfirst() was not called. */ diff --git a/storage/perfschema/pfs_digest.cc b/storage/perfschema/pfs_digest.cc index 5db626314a2..58eae435ca9 100644 --- a/storage/perfschema/pfs_digest.cc +++ b/storage/perfschema/pfs_digest.cc @@ -47,7 +47,7 @@ /** Token array : - Token array is an array of bytes to store tokens recieved during parsing. + Token array is an array of bytes to store tokens received during parsing. Following is the way token array is formed. ...<non-id-token><non-id-token><id-token><id_len><id_text>... |