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

Proposed by George Ormond Lorch III on 2014-01-27
Status: Work in progress
Proposed branch: lp:~gl-az/percona-server/bug1273465-5.5
Merge into: lp:percona-server/5.5
Diff against target: 112 lines (+9/-9)
8 files modified
libmysql/errmsg.c (+1/-1)
sql/log_event.cc (+1/-1)
sql/log_event.h (+1/-1)
sql/rpl_utility.cc (+1/-1)
sql/sql_select.cc (+2/-2)
sql/tztime.cc (+1/-1)
storage/innobase/fil/fil0fil.c (+1/-1)
storage/myisam/mi_rnext.c (+1/-1)
To merge this branch: bzr merge lp:~gl-az/percona-server/bug1273465-5.5
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Needs Fixing on 2014-01-28
Laurynas Biveinis (community) 2014-01-27 Needs Fixing on 2014-01-28
Review via email: mp+203435@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

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) wrote :

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) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
82 "Attempt to read a row while there is no result set associated with the statement",82 "Attempt to read a row while there is no result set associated with the statement",
83 "This feature is not implemented yet",83 "This feature is not implemented yet",
84 "Lost connection to MySQL server at '%s', system error: %d",84 "Lost connection to MySQL server at '%s', system error: %d",
85 "Statement closed indirectly because of a preceeding %s() call",85 "Statement closed indirectly because of a preceding %s() call",
86 "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",86 "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",
87 "This handle is already connected. Use a separate handle for each connection.",87 "This handle is already connected. Use a separate handle for each connection.",
88 "Authentication plugin '%s' cannot be loaded: %s",88 "Authentication plugin '%s' cannot be loaded: %s",
8989
=== 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 @@
3340 if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))3340 if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
3341 {3341 {
3342 const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,3342 const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
3343 "Error in cleaning up after an event preceeding the commit; "3343 "Error in cleaning up after an event preceding the commit; "
3344 "the group log file/position: %s %s",3344 "the group log file/position: %s %s",
3345 const_cast<Relay_log_info*>(rli)->group_master_log_name,3345 const_cast<Relay_log_info*>(rli)->group_master_log_name,
3346 llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,3346 llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
33473347
=== 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 @@
1773 bool is_valid() const { return query != 0; }1773 bool is_valid() const { return query != 0; }
17741774
1775 /*1775 /*
1776 Returns number of bytes additionaly written to post header by derived1776 Returns number of bytes additionally written to post header by derived
1777 events (so far it is only Execute_load_query event).1777 events (so far it is only Execute_load_query event).
1778 */1778 */
1779 virtual ulong get_post_header_size_for_derived() { return 0; }1779 virtual ulong get_post_header_size_for_derived() { return 0; }
17801780
=== 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 @@
1115void Deferred_log_events::rewind()1115void Deferred_log_events::rewind()
1116{1116{
1117 /*1117 /*
1118 Reset preceeding Query log event events which execution was1118 Reset preceding Query log event events which execution was
1119 deferred because of slave side filtering.1119 deferred because of slave side filtering.
1120 */1120 */
1121 if (!is_empty())1121 if (!is_empty())
11221122
=== 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 @@
15102 Item *view_ref= NULL;15102 Item *view_ref= NULL;
15103 /*15103 /*
15104 If we have found field not by its alias in select list but by its15104 If we have found field not by its alias in select list but by its
15105 original field name, we should additionaly check if we have conflict15105 original field name, we should additionally check if we have conflict
15106 for this name (in case if we would perform lookup in all tables).15106 for this name (in case if we would perform lookup in all tables).
15107 */15107 */
15108 if (resolution == RESOLVED_BEHIND_ALIAS && !order_item->fixed &&15108 if (resolution == RESOLVED_BEHIND_ALIAS && !order_item->fixed &&
@@ -16086,7 +16086,7 @@
16086 We are replacing the argument of Item_func_set_user_var after its value16086 We are replacing the argument of Item_func_set_user_var after its value
16087 has been read. The argument's null_value should be set by now, so we16087 has been read. The argument's null_value should be set by now, so we
16088 must set it explicitly for the replacement argument since the null_value16088 must set it explicitly for the replacement argument since the null_value
16089 may be read without any preceeding call to val_*().16089 may be read without any preceding call to val_*().
16090 */16090 */
16091 new_field->update_null_value();16091 new_field->update_null_value();
16092 List<Item> list;16092 List<Item> list;
1609316093
=== 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 @@
20052005
2006 /*2006 /*
2007 At last we are doing the same thing for records in2007 At last we are doing the same thing for records in
2008 mysql.time_zone_transition table. Here we additionaly need records2008 mysql.time_zone_transition table. Here we additionally need records
2009 in ascending order by index scan also satisfies us.2009 in ascending order by index scan also satisfies us.
2010 */2010 */
2011 table= tz_tables->table; 2011 table= tz_tables->table;
20122012
=== 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 @@
3931 page_no = dict_index_get_page(index);3931 page_no = dict_index_get_page(index);
3932 ut_a(page_no == 3);3932 ut_a(page_no == 3);
39333933
3934 fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionaly on buffer pool.\n");3934 fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionally on buffer pool.\n");
39353935
3936 /* down to leaf */3936 /* down to leaf */
3937 mtr_start(&mtr);3937 mtr_start(&mtr);
39383938
=== 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 @@
64 Normally SQL layer would never request "search next" if64 Normally SQL layer would never request "search next" if
65 "search first" failed. But HANDLER may do anything.65 "search first" failed. But HANDLER may do anything.
6666
67 As mi_rnext() without preceeding mi_rkey()/mi_rfirst()67 As mi_rnext() without preceding mi_rkey()/mi_rfirst()
68 equals to mi_rfirst(), we must restore original state68 equals to mi_rfirst(), we must restore original state
69 as if failing mi_rfirst() was not called.69 as if failing mi_rfirst() was not called.
70 */70 */

Subscribers

People subscribed via source and target branches