Merge lp:~otto/maria/maria-fix-spelling-5.5 into lp:maria/5.5

[Otto Kekäläinen]

These are trivial spelling and execution bit fixes. My patch and all fixes to it are provided to the MariaDB Foundation under the MCA (as required at https://mariadb.com/kb/en/contributing-code/).

[Otto Kekäläinen (otto)]

Issue opened at https://mariadb.atlassian.net/browse/MDEV-6153

=== modified file 'include/mysql_com.h'
--- include/mysql_com.h	2014-03-17 12:04:28 +0000
+++ include/mysql_com.h	2014-04-20 08:03:23 +0000
@@ -110,7 +110,7 @@
 #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

=== modified file 'libmysql/errmsg.c'
--- libmysql/errmsg.c	2014-03-17 12:04:28 +0000
+++ libmysql/errmsg.c	2014-04-20 08:03:23 +0000
@@ -81,7 +81,7 @@
   "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: %d",
-  "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",

=== modified file 'man/mysql-test-run.pl.1'
--- man/mysql-test-run.pl.1	2011-11-21 17:13:14 +0000
+++ man/mysql-test-run.pl.1	2014-04-20 08:03:23 +0000
@@ -332,7 +332,7 @@
 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

=== modified file 'mysql-test/collections/default.weekly' (properties changed: +x to -x)
=== modified file 'mysql-test/extra/rpl_tests/rpl_ddl.test'
--- mysql-test/extra/rpl_tests/rpl_ddl.test	2014-02-11 14:57:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_ddl.test	2014-04-20 08:03:23 +0000
@@ -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

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- mysql-test/extra/rpl_tests/rpl_row_basic.test	2012-05-21 18:54:41 +0000
+++ mysql-test/extra/rpl_tests/rpl_row_basic.test	2014-04-20 08:03:23 +0000
@@ -221,7 +221,7 @@
 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 @@
 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';
 

=== modified file 'mysql-test/include/wait_until_count_sessions.inc'
--- mysql-test/include/wait_until_count_sessions.inc	2010-05-24 13:54:08 +0000
+++ mysql-test/include/wait_until_count_sessions.inc	2014-04-20 08:03:23 +0000
@@ -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

=== modified file 'mysql-test/include/world.inc' (properties changed: +x to -x)
=== modified file 'mysql-test/include/world_schema.inc' (properties changed: +x to -x)
=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2014-04-13 12:58:55 +0000
+++ mysql-test/mysql-test-run.pl	2014-04-20 08:03:23 +0000
@@ -6484,7 +6484,7 @@
   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

=== modified file 'mysql-test/r/mysqld--help.result'
--- mysql-test/r/mysqld--help.result	2014-02-11 14:56:38 +0000
+++ mysql-test/r/mysqld--help.result	2014-04-20 08:03:23 +0000
@@ -613,7 +613,7 @@
  --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 

=== modified file 'mysql-test/r/ps.result'
--- mysql-test/r/ps.result	2014-02-12 15:07:05 +0000
+++ mysql-test/r/ps.result	2014-04-20 08:03:23 +0000
@@ -613,8 +613,8 @@
 ("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 @@
 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 *

=== modified file 'mysql-test/r/subselect_sj.result'
--- mysql-test/r/subselect_sj.result	2014-02-22 21:51:20 +0000
+++ mysql-test/r/subselect_sj.result	2014-04-20 08:03:23 +0000
@@ -1007,8 +1007,8 @@
 ("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,

=== modified file 'mysql-test/r/subselect_sj_jcl6.result'
--- mysql-test/r/subselect_sj_jcl6.result	2014-02-22 21:51:20 +0000
+++ mysql-test/r/subselect_sj_jcl6.result	2014-04-20 08:03:23 +0000
@@ -1020,8 +1020,8 @@
 ("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,

=== modified file 'mysql-test/std_data/checkDBI_DBD-mysql.pl' (properties changed: -x to +x)
=== modified file 'mysql-test/suite/funcs_1/views/func_view.inc'
--- mysql-test/suite/funcs_1/views/func_view.inc	2013-10-23 12:22:47 +0000
+++ mysql-test/suite/funcs_1/views/func_view.inc	2014-04-20 08:03:23 +0000
@@ -282,7 +282,7 @@
 #               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 = ' ---äÖüß@µ*$-- ',

=== modified file 'mysql-test/suite/funcs_1/views/views_master.inc'
--- mysql-test/suite/funcs_1/views/views_master.inc	2012-01-13 14:50:02 +0000
+++ mysql-test/suite/funcs_1/views/views_master.inc	2014-04-20 08:03:23 +0000
@@ -545,7 +545,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 ;

=== modified file 'mysql-test/suite/rpl/extension/checksum.pl' (properties changed: -x to +x)
=== modified file 'mysql-test/suite/rpl/t/rpl_ddl.test'
--- mysql-test/suite/rpl/t/rpl_ddl.test	2012-02-07 15:22:36 +0000
+++ mysql-test/suite/rpl/t/rpl_ddl.test	2014-04-20 08:03:23 +0000
@@ -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

=== modified file 'mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test'
--- mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test	2011-10-19 19:45:18 +0000
+++ mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test	2014-04-20 08:03:23 +0000
@@ -244,7 +244,7 @@
 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 ****

=== modified file 'mysql-test/t/long_tmpdir-master.sh' (properties changed: -x to +x)
=== modified file 'mysql-test/t/lowercase_mixed_tmpdir-master.sh' (properties changed: -x to +x)
=== modified file 'mysql-test/t/ps.test'
--- mysql-test/t/ps.test	2014-02-12 15:07:05 +0000
+++ mysql-test/t/ps.test	2014-04-20 08:03:23 +0000
@@ -677,8 +677,8 @@
 
 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 @@
 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 *

=== modified file 'mysql-test/t/subselect_sj.test'
--- mysql-test/t/subselect_sj.test	2014-02-22 21:51:20 +0000
+++ mysql-test/t/subselect_sj.test	2014-04-20 08:03:23 +0000
@@ -897,8 +897,8 @@
                       ("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 (

=== modified file 'sql/handler.h'
--- sql/handler.h	2014-04-11 08:46:11 +0000
+++ sql/handler.h	2014-04-20 08:03:23 +0000
@@ -1270,7 +1270,7 @@
     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;
   uint null_bits;                       /* NULL bits at start of record */

=== modified file 'sql/log_event.cc'
--- sql/log_event.cc	2014-03-27 21:26:58 +0000
+++ sql/log_event.cc	2014-04-20 08:03:23 +0000
@@ -3649,7 +3649,7 @@
     if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), 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,

=== modified file 'sql/log_event.h'
--- sql/log_event.h	2014-03-27 21:26:58 +0000
+++ sql/log_event.h	2014-04-20 08:03:23 +0000
@@ -1860,7 +1860,7 @@
   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; }

=== modified file 'sql/password.c'
--- sql/password.c	2014-03-17 12:04:28 +0000
+++ sql/password.c	2014-04-20 08:03:23 +0000
@@ -425,7 +425,7 @@
 
 /*
     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.
@@ -467,7 +467,7 @@
 
 /*
     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).

=== modified file 'sql/rpl_utility.cc'
--- sql/rpl_utility.cc	2014-03-17 12:04:28 +0000
+++ sql/rpl_utility.cc	2014-04-20 08:03:23 +0000
@@ -1157,7 +1157,7 @@
 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())

=== modified file 'sql/slave.cc'
--- sql/slave.cc	2014-03-17 12:04:28 +0000
+++ sql/slave.cc	2014-04-20 08:03:23 +0000
@@ -3503,7 +3503,7 @@
   set_thd_in_use_temporary_tables(rli);   // (re)set sql_thd in use for saved temp tables
   /*
     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;

=== modified file 'sql/sql_connect.cc'
--- sql/sql_connect.cc	2014-02-17 10:00:51 +0000
+++ sql/sql_connect.cc	2014-04-20 08:03:23 +0000
@@ -704,7 +704,7 @@
   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-

=== modified file 'sql/sql_prepare.cc'
--- sql/sql_prepare.cc	2014-03-17 12:04:28 +0000
+++ sql/sql_prepare.cc	2014-04-20 08:03:23 +0000
@@ -74,7 +74,7 @@
 
   - 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.

=== modified file 'sql/sql_select.cc'
--- sql/sql_select.cc	2014-04-18 08:16:56 +0000
+++ sql/sql_select.cc	2014-04-20 08:03:23 +0000
@@ -20382,7 +20382,7 @@
     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 &&
@@ -21405,7 +21405,7 @@
          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;

=== modified file 'sql/sys_vars.cc'
--- sql/sys_vars.cc	2014-02-11 14:56:38 +0000
+++ sql/sys_vars.cc	2014-04-20 08:03:23 +0000
@@ -3815,7 +3815,7 @@
 #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));

=== modified file 'sql/tztime.cc'
--- sql/tztime.cc	2014-03-17 12:04:28 +0000
+++ sql/tztime.cc	2014-04-20 08:03:23 +0000
@@ -2032,7 +2032,7 @@
 
   /*
     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; 

=== modified file 'storage/maria/ma_rnext.c'
--- storage/maria/ma_rnext.c	2011-10-19 19:45:18 +0000
+++ storage/maria/ma_rnext.c	2014-04-20 08:03:23 +0000
@@ -71,7 +71,7 @@
       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.
     */

=== modified file 'storage/myisam/mi_rnext.c'
--- storage/myisam/mi_rnext.c	2012-01-13 14:50:02 +0000
+++ storage/myisam/mi_rnext.c	2014-04-20 08:03:23 +0000
@@ -66,7 +66,7 @@
       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.
     */

=== modified file 'storage/ndb/include/ndbapi/NdbEventOperation.hpp'
--- storage/ndb/include/ndbapi/NdbEventOperation.hpp	2014-03-27 21:26:58 +0000
+++ storage/ndb/include/ndbapi/NdbEventOperation.hpp	2014-04-20 08:03:23 +0000
@@ -63,7 +63,7 @@
  * - 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 occured not all events will be received
  * anymore. Drop NdbEventOperation and Create again after nodes are up
  * again. Will be fixed in later versions.
  *

=== modified file 'storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs'
--- storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs	2014-02-17 12:49:04 +0000
+++ storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs	2014-04-20 08:03:23 +0000
@@ -163,7 +163,7 @@
 				}
 				else
 				{
-					// If no data was recieved then the connection is probably dead
+					// If no data was received then the connection is probably dead
 					Console.WriteLine( "Disconnected", sock.RemoteEndPoint );
 					sock.Shutdown( SocketShutdown.Both );
 					sock.Close();

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2014-02-17 12:49:04 +0000
+++ storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2014-04-20 08:03:23 +0000
@@ -10559,7 +10559,7 @@
 
   // MASV let state be CS_ABORTING until all 
   // signals in the "air" have been received. Reset to CS_CONNECTED
-  // will be done when a TCKEYREQ with start flag is recieved
+  // will be done when a TCKEYREQ with start flag is received
   // or releaseApiCon is called
   // apiConnectptr.p->apiConnectstate = CS_CONNECTED;
   apiConnectptr.p->apiConnectstate = CS_ABORTING;

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.hpp'
--- storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2014-02-17 12:49:04 +0000
+++ storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2014-04-20 08:03:23 +0000
@@ -526,7 +526,7 @@
   //  we signal with a condition variable to the waiting
   //  thread (receiveOptimisedResponse) that the signal has arrived.
   // Parameters:
-  //  signal: The recieved signal
+  //  signal: The received signal
   // Returns: -
   //**************************************************************************
 

=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- storage/ndb/test/ndbapi/testDict.cpp	2014-02-17 12:49:04 +0000
+++ storage/ndb/test/ndbapi/testDict.cpp	2014-04-20 08:03:23 +0000
@@ -942,7 +942,7 @@
     
     // Verfiy the frm data
     if (memcmp(pData, pData2, resultLen) != 0){
-      g_err << "Wrong data recieved" << endl;
+      g_err << "Wrong data received" << endl;
       for (size_t i = 0; i < dataLen; i++){
 	unsigned char c = ((unsigned char*)pData2)[i];
 	g_err << hex << c << ", ";

=== modified file 'storage/ndb/test/odbc/client/SQLColAttributeTest.cpp'
--- storage/ndb/test/odbc/client/SQLColAttributeTest.cpp	2014-02-17 12:49:04 +0000
+++ storage/ndb/test/odbc/client/SQLColAttributeTest.cpp	2014-04-20 08:03:23 +0000
@@ -42,7 +42,7 @@
  * Test returning descriptor information
  *
  * Tests:
- * -# Call SQLColAttribute, without preceeding SQLPrepare
+ * -# Call SQLColAttribute, without preceding SQLPrepare
  * -# ???
  * 
  * @return Zero, if test succeeded

=== modified file 'storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp'
--- storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp	2014-02-17 12:49:04 +0000
+++ storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp	2014-04-20 08:03:23 +0000
@@ -42,7 +42,7 @@
  * Test returning descriptor information
  *
  * Test:
- * -# Call SQLColAttribute without preceeding SQLExecute
+ * -# Call SQLColAttribute without preceding SQLExecute
  * -# Let TYPE is 'ITEM' in Table 20, FieldIdentifer is zero
  * -# Let TYPE is 'ITEM' in Table 20, ColumnNumber is less than one
  * -# FieldIdentifer is not one of the code valuess in Table 20

=== modified file 'storage/tokudb/ft-index/ft/ft-flusher.cc'
--- storage/tokudb/ft-index/ft/ft-flusher.cc	2014-02-20 18:32:25 +0000
+++ storage/tokudb/ft-index/ft/ft-flusher.cc	2014-04-20 08:03:23 +0000
@@ -1012,7 +1012,7 @@
             B->bp[targchild] = node->bp[i];
             memset(&node->bp[i], 0, sizeof(node->bp[0]));
 
-            // Delete a child, removing the preceeding pivot key.  The child number must be > 0
+            // Delete a child, removing the preceding pivot key.  The child number must be > 0
             {
                 paranoid_invariant(i>0);
                 if (i>n_children_in_a) {

=== modified file 'storage/xtradb/fil/fil0fil.c'
--- storage/xtradb/fil/fil0fil.c	2014-02-26 11:49:50 +0000
+++ storage/xtradb/fil/fil0fil.c	2014-04-20 08:03:23 +0000
@@ -3931,7 +3931,7 @@
 		page_no = dict_index_get_page(index);
 		ut_a(page_no == 3);
 
-		fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionaly on buffer pool.\n");
+		fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionally on buffer pool.\n");
 
 		/* down to leaf */
 		mtr_start(&mtr);