1
Author <nicholas@periapt.co.uk>
2
Subject: spelling errors
3
Preceeding -> preceding
4
Last-Update: 2012-10-24
6
Index: mysql-5.5-5.5.31+dfsg/libmysql/errmsg.c
7
===================================================================
8
--- mysql-5.5-5.5.31+dfsg.orig/libmysql/errmsg.c 2013-05-05 09:47:48.243181980 -0700
9
+++ mysql-5.5-5.5.31+dfsg/libmysql/errmsg.c 2013-05-05 09:47:48.183185478 -0700
11
"Attempt to read a row while there is no result set associated with the statement",
12
"This feature is not implemented yet",
13
"Lost connection to MySQL server at '%s', system error: %d",
14
- "Statement closed indirectly because of a preceeding %s() call",
15
+ "Statement closed indirectly because of a preceding %s() call",
16
"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",
17
"This handle is already connected. Use a separate handle for each connection.",
18
"Authentication plugin '%s' cannot be loaded: %s",
19
Index: mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_ddl.test
20
===================================================================
21
--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-05-05 09:47:48.243181980 -0700
22
+++ mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_ddl.test 2013-05-05 09:47:48.183185478 -0700
24
# --> less switching of AUTOCOMMIT mode on master side.
26
# 4. Never use a test object, which was direct or indirect affected by a
27
-# preceeding test sequence again.
28
-# If one preceeding test sequence hits a (sometimes not visible,
29
+# preceding test sequence again.
30
+# If one preceding test sequence hits a (sometimes not visible,
31
# because the sql error code of the statement might be 0) bug
32
# and these rules are ignored, a following test sequence might earn ugly
33
# effects like failing 'sync_slave_with_master', crashes of the slave or
34
Index: mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_row_basic.test
35
===================================================================
36
--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-05-05 09:47:48.243181980 -0700
37
+++ mysql-5.5-5.5.31+dfsg/mysql-test/extra/rpl_tests/rpl_row_basic.test 2013-05-05 09:47:48.183185478 -0700
39
SELECT * FROM t7 ORDER BY C1;
41
# since bug#31552/31609 idempotency is not default any longer. In order
42
-# the preceeding test INSERT INTO t7 to pass the mode is switched
43
+# the preceding test INSERT INTO t7 to pass the mode is switched
45
set @@global.slave_exec_mode= 'IDEMPOTENT';
48
SELECT * FROM t8 ORDER BY a;
50
# since bug#31552/31609 idempotency is not default any longer. In order
51
-# the preceeding test INSERT INTO t8 to pass the mode is switched
52
+# the preceding test INSERT INTO t8 to pass the mode is switched
54
set @@global.slave_exec_mode= 'IDEMPOTENT';
56
Index: mysql-5.5-5.5.31+dfsg/mysql-test/include/wait_until_count_sessions.inc
57
===================================================================
58
--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/include/wait_until_count_sessions.inc 2013-05-05 09:47:48.243181980 -0700
59
+++ mysql-5.5-5.5.31+dfsg/mysql-test/include/wait_until_count_sessions.inc 2013-05-05 09:47:48.183185478 -0700
61
# 1. We wait for $current_sessions <= $count_sessions because in the use case
62
# with count_sessions.inc before and wait_until_count_sessions.inc after
63
# the core of the test it could happen that the disconnects of sessions
64
-# belonging to the preceeding test are not finished.
65
+# belonging to the preceding test are not finished.
66
# sessions at test begin($count_sessions) = m + n
67
# sessions of the previous test which will be soon disconnected = n (n >= 0)
68
# sessions at test end ($current sessions, assuming the test disconnects
69
Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/func_view.inc
70
===================================================================
71
--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/funcs_1/views/func_view.inc 2013-05-05 09:47:48.243181980 -0700
72
+++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/func_view.inc 2013-05-05 09:47:48.183185478 -0700
74
# other interesting value
76
# strings, blobs, binaries -> not full length of used data type, "exotic"
77
-# characters and preceeding and trailing spaces
78
+# characters and preceding and trailing spaces
80
INSERT INTO t1_values SET
81
my_char_30 = ' ---äÖüß@µ*$-- ',
82
Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/views_master.inc
83
===================================================================
84
--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/funcs_1/views/views_master.inc 2013-05-05 09:47:48.243181980 -0700
85
+++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/funcs_1/views/views_master.inc 2013-05-05 09:47:48.187185245 -0700
87
# view names are accepted, at creation time, alteration time,
89
###############################################################################
90
-# Note(mleich): non-qualified view name means a view name without preceeding
91
+# Note(mleich): non-qualified view name means a view name without preceding
94
DROP VIEW IF EXISTS v1 ;
95
Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_ddl.test
96
===================================================================
97
--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/rpl_ddl.test 2013-05-05 09:47:48.243181980 -0700
98
+++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_ddl.test 2013-05-05 09:47:48.187185245 -0700
102
# 2. Never use a test object, which was direct or indirect affected by a
103
-# preceeding test sequence again.
104
+# preceding test sequence again.
105
# Except table d1.t1 where ONLY DML is allowed.
107
-# If one preceeding test sequence hits a (sometimes not good visible,
108
+# If one preceding test sequence hits a (sometimes not good visible,
109
# because the sql error code of the statement might be 0) bug
110
# and these rules are ignored, a following test sequence might earn ugly
111
# effects like failing 'sync_slave_with_master', crashes of the slave or
112
Index: mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
113
===================================================================
114
--- mysql-5.5-5.5.31+dfsg.orig/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-05-05 09:47:48.243181980 -0700
115
+++ mysql-5.5-5.5.31+dfsg/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test 2013-05-05 09:47:48.187185245 -0700
117
UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1;
118
SELECT * FROM t1 ORDER BY a;
119
# since bug#31552/31609 idempotency is not default any longer. In
120
-# order for the preceeding test UPDATE t1 to pass, the mode is switched
121
+# order for the preceding test UPDATE t1 to pass, the mode is switched
123
set @@global.slave_exec_mode= 'IDEMPOTENT';
124
--echo **** On Master ****
125
Index: mysql-5.5-5.5.31+dfsg/sql/log_event.cc
126
===================================================================
127
--- mysql-5.5-5.5.31+dfsg.orig/sql/log_event.cc 2013-05-05 09:47:48.243181980 -0700
128
+++ mysql-5.5-5.5.31+dfsg/sql/log_event.cc 2013-05-05 09:47:48.000000000 -0700
129
@@ -3312,7 +3312,7 @@
130
if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
132
const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
133
- "Error in cleaning up after an event preceeding the commit; "
134
+ "Error in cleaning up after an event preceding the commit; "
135
"the group log file/position: %s %s",
136
const_cast<Relay_log_info*>(rli)->group_master_log_name,
137
llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
138
Index: mysql-5.5-5.5.31+dfsg/storage/myisam/mi_rnext.c
139
===================================================================
140
--- mysql-5.5-5.5.31+dfsg.orig/storage/myisam/mi_rnext.c 2013-05-05 09:47:48.243181980 -0700
141
+++ mysql-5.5-5.5.31+dfsg/storage/myisam/mi_rnext.c 2013-05-05 09:47:48.219183379 -0700
143
Normally SQL layer would never request "search next" if
144
"search first" failed. But HANDLER may do anything.
146
- As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
147
+ As mi_rnext() without preceding mi_rkey()/mi_rfirst()
148
equals to mi_rfirst(), we must restore original state
149
as if failing mi_rfirst() was not called.
151
Index: mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
152
===================================================================
153
--- mysql-5.5-5.5.31+dfsg.orig/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-05-05 09:47:48.243181980 -0700
154
+++ mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp 2013-05-05 09:47:48.231182679 -0700
156
* Test returning descriptor information
159
- * -# Call SQLColAttribute, without preceeding SQLPrepare
160
+ * -# Call SQLColAttribute, without preceding SQLPrepare
163
* @return Zero, if test succeeded
164
Index: mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
165
===================================================================
166
--- mysql-5.5-5.5.31+dfsg.orig/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-05-05 09:47:48.243181980 -0700
167
+++ mysql-5.5-5.5.31+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp 2013-05-05 09:47:48.243181980 -0700
169
* Test returning descriptor information
172
- * -# Call SQLColAttribute without preceeding SQLExecute
173
+ * -# Call SQLColAttribute without preceding SQLExecute
174
* -# Let TYPE is 'ITEM' in Table 20, FieldIdentifer is zero
175
* -# Let TYPE is 'ITEM' in Table 20, ColumnNumber is less than one
176
* -# FieldIdentifer is not one of the code valuess in Table 20