1
Author <nicholas@periapt.co.uk>
2
Subject: spelling errors
3
Preceeding -> preceding
4
Last-Update: 2012-05-19
8
@@ -253,7 +253,7 @@ the type of event which will be either
11
Additionally, an event which has registered interest in more than one of the
12
-preceeding events, via bitwise-OR to
13
+preceding events, via bitwise-OR to
15
can provide its callback function with a bitwise-OR of more than one triggered
17
--- a/mysql-test/extra/rpl_tests/rpl_ddl.test
18
+++ b/mysql-test/extra/rpl_tests/rpl_ddl.test
20
# --> less switching of AUTOCOMMIT mode on master side.
22
# 4. Never use a test object, which was direct or indirect affected by a
23
-# preceeding test sequence again.
24
-# If one preceeding test sequence hits a (sometimes not visible,
25
+# preceding test sequence again.
26
+# If one preceding test sequence hits a (sometimes not visible,
27
# because the sql error code of the statement might be 0) bug
28
# and these rules are ignored, a following test sequence might earn ugly
29
# effects like failing 'sync_slave_with_master', crashes of the slave or
30
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test
31
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test
32
@@ -221,7 +221,7 @@ INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
33
SELECT * FROM t7 ORDER BY C1;
35
# since bug#31552/31609 idempotency is not default any longer. In order
36
-# the preceeding test INSERT INTO t7 to pass the mode is switched
37
+# the preceding test INSERT INTO t7 to pass the mode is switched
39
set @@global.slave_exec_mode= 'IDEMPOTENT';
41
@@ -260,7 +260,7 @@ INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9);
42
SELECT * FROM t8 ORDER BY a;
44
# since bug#31552/31609 idempotency is not default any longer. In order
45
-# the preceeding test INSERT INTO t8 to pass the mode is switched
46
+# the preceding test INSERT INTO t8 to pass the mode is switched
48
set @@global.slave_exec_mode= 'IDEMPOTENT';
50
--- a/mysql-test/include/wait_until_count_sessions.inc
51
+++ b/mysql-test/include/wait_until_count_sessions.inc
53
# 1. We wait for $current_sessions <= $count_sessions because in the use case
54
# with count_sessions.inc before and wait_until_count_sessions.inc after
55
# the core of the test it could happen that the disconnects of sessions
56
-# belonging to the preceeding test are not finished.
57
+# belonging to the preceding test are not finished.
58
# sessions at test begin($count_sessions) = m + n
59
# sessions of the previous test which will be soon disconnected = n (n >= 0)
60
# sessions at test end ($current sessions, assuming the test disconnects
61
--- a/mysql-test/suite/funcs_1/views/func_view.inc
62
+++ b/mysql-test/suite/funcs_1/views/func_view.inc
63
@@ -285,7 +285,7 @@ INSERT INTO t1_values SET
64
# other interesting value
66
# strings, blobs, binaries -> not full length of used data type, "exotic"
67
-# characters and preceeding and trailing spaces
68
+# characters and preceding and trailing spaces
70
INSERT INTO t1_values SET
71
my_char_30 = ' ---äÖüß@µ*$-- ',
72
--- a/mysql-test/suite/funcs_1/views/views_master.inc
73
+++ b/mysql-test/suite/funcs_1/views/views_master.inc
74
@@ -545,7 +545,7 @@ let $message= Testcase 3.3.1.7 ;
75
# view names are accepted, at creation time, alteration time,
77
###############################################################################
78
-# Note(mleich): non-qualified view name means a view name without preceeding
79
+# Note(mleich): non-qualified view name means a view name without preceding
82
DROP VIEW IF EXISTS v1 ;
83
--- a/mysql-test/suite/rpl/t/rpl_ddl.test
84
+++ b/mysql-test/suite/rpl/t/rpl_ddl.test
88
# 2. Never use a test object, which was direct or indirect affected by a
89
-# preceeding test sequence again.
90
+# preceding test sequence again.
91
# Except table d1.t1 where ONLY DML is allowed.
93
-# If one preceeding test sequence hits a (sometimes not good visible,
94
+# If one preceding test sequence hits a (sometimes not good visible,
95
# because the sql error code of the statement might be 0) bug
96
# and these rules are ignored, a following test sequence might earn ugly
97
# effects like failing 'sync_slave_with_master', crashes of the slave or
98
--- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
99
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
100
@@ -239,7 +239,7 @@ sync_slave_with_master;
101
UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1;
102
SELECT * FROM t1 ORDER BY a;
103
# since bug#31552/31609 idempotency is not default any longer. In
104
-# order for the preceeding test UPDATE t1 to pass, the mode is switched
105
+# order for the preceding test UPDATE t1 to pass, the mode is switched
107
set @@global.slave_exec_mode= 'IDEMPOTENT';
108
--echo **** On Master ****
109
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test
110
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test
114
# 2. Never use a test object, which was direct or indirect affected by a
115
-# preceeding test sequence again.
116
+# preceding test sequence again.
117
# Except table d1.t1 where ONLY DML is allowed.
119
-# If one preceeding test sequence hits a (sometimes not good visible,
120
+# If one preceding test sequence hits a (sometimes not good visible,
121
# because the sql error code of the statement might be 0) bug
122
# and these rules are ignored, a following test sequence might earn ugly
123
# effects like failing 'sync_slave_with_master', crashes of the slave or
124
--- a/sql/abstract_query_plan.cc
125
+++ b/sql/abstract_query_plan.cc
126
@@ -336,7 +336,7 @@ namespace AQP
129
use_quick == 2 means that the decision on which access method to use
130
- will be taken late (as rows from the preceeding operation arrive).
131
+ will be taken late (as rows from the preceding operation arrive).
132
This operation is therefor not pushable.
135
--- a/sql/ha_ndbcluster_push.cc
136
+++ b/sql/ha_ndbcluster_push.cc
137
@@ -1271,7 +1271,7 @@ ndb_pushed_builder_ctx::build_key(const AQP::Table_access* table,
138
if (m_join_scope.contain(referred_table_no))
140
// Locate the parent operation for this 'join_items[]'.
141
- // May refer any of the preceeding parent tables
142
+ // May refer any of the preceding parent tables
143
const NdbQueryOperationDef* const parent_op= m_tables[referred_table_no].m_op;
144
DBUG_ASSERT(parent_op != NULL);
146
--- a/sql/log_event.cc
147
+++ b/sql/log_event.cc
148
@@ -4595,7 +4595,7 @@ int Query_log_event::do_apply_event(Relay_log_info const *rli,
149
if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
151
const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
152
- "Error in cleaning up after an event preceeding the commit; "
153
+ "Error in cleaning up after an event preceding the commit; "
154
"the group log file/position: %s %s",
155
const_cast<Relay_log_info*>(rli)->get_group_master_log_name(),
156
llstr(const_cast<Relay_log_info*>(rli)->get_group_master_log_pos(),
157
--- a/sql/rpl_utility.cc
158
+++ b/sql/rpl_utility.cc
159
@@ -1575,7 +1575,7 @@ bool Deferred_log_events::execute(Relay_log_info *rli)
160
void Deferred_log_events::rewind()
163
- Reset preceeding Query log event events which execution was
164
+ Reset preceding Query log event events which execution was
165
deferred because of slave side filtering.
168
--- a/sql/sql_optimizer.cc
169
+++ b/sql/sql_optimizer.cc
170
@@ -970,7 +970,7 @@ JOIN::optimize()
174
- else if (order && // ORDER BY wo/ preceeding GROUP BY
175
+ else if (order && // ORDER BY wo/ preceding GROUP BY
176
(simple_order || skip_sort_order)) // which is possibly skippable
178
if (test_if_skip_sort_order(tab, order, m_select_limit, false,
179
--- a/sql/sql_rewrite.cc
180
+++ b/sql/sql_rewrite.cc
185
- Append a key/value pair to a string, with an optional preceeding comma.
186
+ Append a key/value pair to a string, with an optional preceding comma.
189
@param str The string to append to
190
@@ -72,7 +72,7 @@ bool append_int(String *str, bool comma, const char *txt, size_t len,
193
Append a key/value pair to a string if the value is non-NULL,
194
- with an optional preceeding comma.
195
+ with an optional preceding comma.
197
@param str The string to append to
198
@param comma Prepend a comma?
199
--- a/sql/sql_yacc.cc
200
+++ b/sql/sql_yacc.cc
201
@@ -39064,7 +39064,7 @@ yyreduce:
204
Not in trigger assigning value to new row,
205
- and option_type preceeding local variable is illegal.
206
+ and option_type preceding local variable is illegal.
208
my_parse_error(ER(ER_SYNTAX_ERROR));
210
--- a/sql/sql_yacc.yy
211
+++ b/sql/sql_yacc.yy
212
@@ -14559,7 +14559,7 @@ opt_var_ident_type:
213
| SESSION_SYM '.' { $$=OPT_SESSION; }
216
-// Option values with preceeding option_type.
217
+// Option values with preceding option_type.
218
option_value_following_option_type:
219
internal_variable_name equal set_expr_or_default
221
@@ -14576,7 +14576,7 @@ option_value_following_option_type:
224
Not in trigger assigning value to new row,
225
- and option_type preceeding local variable is illegal.
226
+ and option_type preceding local variable is illegal.
228
my_parse_error(ER(ER_SYNTAX_ERROR));
230
@@ -14584,7 +14584,7 @@ option_value_following_option_type:
234
-// Option values without preceeding option_type.
235
+// Option values without preceding option_type.
236
option_value_no_option_type:
237
internal_variable_name equal
239
--- a/storage/myisam/mi_rnext.c
240
+++ b/storage/myisam/mi_rnext.c
241
@@ -65,7 +65,7 @@ int mi_rnext(MI_INFO *info, uchar *buf, int inx)
242
Normally SQL layer would never request "search next" if
243
"search first" failed. But HANDLER may do anything.
245
- As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
246
+ As mi_rnext() without preceding mi_rkey()/mi_rfirst()
247
equals to mi_rfirst(), we must restore original state
248
as if failing mi_rfirst() was not called.