Merge lp:~gl-az/percona-server/bug1273465-5.5 into lp:percona-server/5.5

[George Ormond Lorch III]

Fix for bug1273465 - lintian warnings and errors (new packaging)
Corrected minor spelling errors with the exception of 'yuR' as that does not appear anywhere in the code base.

[George Ormond Lorch III (gl-az)]

jenkins http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/936/

[Laurynas Biveinis (laurynas-biveinis)]

Is there a reason not to do a GCA and a 5.6 branch? (and those typos should be reported to upstream too)

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Lintian complains about spelling errors in strings found in the binary image (i.e. it executes 'strings' and checks the output about common spelling mistakes). What's the point to modify code comments?

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

Laurynas, I did start with branches fresh out of the percona_create_branches.sh script but it apparently failed. I did not catch this until after I made the 5.5 MP and tried to merge the changes forward to 5.6. I left it at that yesterday to pick up on today. I now look back at my terminal session and see:

> percona_create_branches.sh server bug1273465
==> mkdir bug1273465
==> bzr branch lp:percona-server/5.6 bug1273465/5.6
Branched 537 revisions.
==> bzr branch lp:percona-server/5.5 bug1273465/5.5
Branched 620 revisions.
Getting the oldest unmerged mainline revision for lp:percona-server/5.5
Using revision 608
Updating bug1273465/5.5 to the last fully merged mainline revision
==> cd bug1273465/5.5
==> bzr pull -q --overwrite -rbefore:608 .
bzr: ERROR: Moving the root directory is not supported at this time

I'll look into this some today.

Yes Laurynas, most of these issues exist upstream as well.

Alexey, I agree, changing source code comments and minor spelling errors IMHO should not be a rational reason to be excluded from a distro. I was asked to do the work under the pretense that it has been vetted and deemed necessary. Please advise otherwise on the JIRA task.

Unmerged revisions

608. By George Ormond Lorch III on 2014-01-27

Fix for bug1273465 - lintian warnings and errors (new packaging)
Corrected minor spelling errors with the exception of 'yuR' as that does not appear anywhere in the code base.

=== modified file 'libmysql/errmsg.c'
--- libmysql/errmsg.c	2013-06-26 07:01:13 +0000
+++ libmysql/errmsg.c	2014-01-27 23:37:11 +0000
@@ -82,7 +82,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 'sql/log_event.cc'
--- sql/log_event.cc	2013-12-16 08:19:34 +0000
+++ sql/log_event.cc	2014-01-27 23:37:11 +0000
@@ -3340,7 +3340,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	2013-08-02 09:40:55 +0000
+++ sql/log_event.h	2014-01-27 23:37:11 +0000
@@ -1773,7 +1773,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/rpl_utility.cc'
--- sql/rpl_utility.cc	2013-10-22 13:33:14 +0000
+++ sql/rpl_utility.cc	2014-01-27 23:37:11 +0000
@@ -1115,7 +1115,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/sql_select.cc'
--- sql/sql_select.cc	2013-09-16 13:54:52 +0000
+++ sql/sql_select.cc	2014-01-27 23:37:11 +0000
@@ -15102,7 +15102,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 &&
@@ -16086,7 +16086,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/tztime.cc'
--- sql/tztime.cc	2013-02-26 05:35:17 +0000
+++ sql/tztime.cc	2014-01-27 23:37:11 +0000
@@ -2005,7 +2005,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/innobase/fil/fil0fil.c'
--- storage/innobase/fil/fil0fil.c	2013-12-05 08:07:26 +0000
+++ storage/innobase/fil/fil0fil.c	2014-01-27 23:37:11 +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);

=== modified file 'storage/myisam/mi_rnext.c'
--- storage/myisam/mi_rnext.c	2011-06-30 15:46:53 +0000
+++ storage/myisam/mi_rnext.c	2014-01-27 23:37:11 +0000
@@ -64,7 +64,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.
     */