Merge lp:~laurynas-biveinis/percona-server/minor-fixes-5.6-porting-5.5 into lp:percona-server/5.5

Proposed by Laurynas Biveinis on 2014-07-23
Status: Merged
Approved by: Laurynas Biveinis on 2014-07-23
Approved revision: 673
Merged at revision: 684
Proposed branch: lp:~laurynas-biveinis/percona-server/minor-fixes-5.6-porting-5.5
Merge into: lp:percona-server/5.5
Diff against target: 60 lines (+0/-17)
4 files modified
sql/handler.h (+0/-4)
sql/sql_show.cc (+0/-2)
storage/innobase/handler/ha_innodb.cc (+0/-10)
storage/innobase/handler/ha_innodb.h (+0/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/minor-fixes-5.6-porting-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2014-07-23
Review via email: mp+227855@code.launchpad.net

Description of the change

Fix assorted minor issues discovered in the 5.6 porting and its code review.

673. By Laurynas Biveinis 14 hours ago
Fix bug 1182050 (Duplicate LIST_PROCESS_HOST_LEN definition) by
removing a copy from sql_show.cc, so that there is only one definition
and that upstream changes to it result in a merge conflict.

672. By Laurynas Biveinis 14 hours ago
Fix bug 1182072 (Unused ha_innobase::is_corrupt() method) by removing
it.

671. By Laurynas Biveinis 14 hours ago
Fix bug 1182046 (Unnecessary MAX_KEY <= 128 compile-time check in
userstat) by removing the check.

http://jenkins.percona.com/job/percona-server-5.5-param/1029/

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sql/handler.h'
2--- sql/handler.h 2013-08-22 13:16:55 +0000
3+++ sql/handler.h 2014-07-23 03:59:03 +0000
4@@ -36,10 +36,6 @@
5 #include <ft_global.h>
6 #include <keycache.h>
7
8-#if MAX_KEY > 128
9-#error MAX_KEY is too large. Values up to 128 are supported.
10-#endif
11-
12 // the following is for checking tables
13
14 #define HA_ADMIN_ALREADY_DONE 1
15
16=== modified file 'sql/sql_show.cc'
17--- sql/sql_show.cc 2014-06-03 13:14:25 +0000
18+++ sql/sql_show.cc 2014-07-23 03:59:03 +0000
19@@ -1062,8 +1062,6 @@
20 }
21
22
23-#define LIST_PROCESS_HOST_LEN 64
24-
25 static bool get_field_default_value(THD *thd, Field *timestamp_field,
26 Field *field, String *def_value,
27 bool quoted)
28
29=== modified file 'storage/innobase/handler/ha_innodb.cc'
30--- storage/innobase/handler/ha_innodb.cc 2014-03-27 15:42:21 +0000
31+++ storage/innobase/handler/ha_innodb.cc 2014-07-23 03:59:03 +0000
32@@ -8995,16 +8995,6 @@
33 return(ranges + (double) rows / (double) total_rows * time_for_scan);
34 }
35
36-UNIV_INTERN
37-bool
38-ha_innobase::is_corrupt() const
39-{
40- if (share->ib_table)
41- return ((bool)share->ib_table->is_corrupt);
42- else
43- return (FALSE);
44-}
45-
46 /*********************************************************************//**
47 Calculates the key number used inside MySQL for an Innobase index. We will
48 first check the "index translation table" for a match of the index to get
49
50=== modified file 'storage/innobase/handler/ha_innodb.h'
51--- storage/innobase/handler/ha_innodb.h 2014-03-27 15:42:21 +0000
52+++ storage/innobase/handler/ha_innodb.h 2014-07-23 03:59:03 +0000
53@@ -141,7 +141,6 @@
54 double scan_time();
55 double read_time(uint index, uint ranges, ha_rows rows);
56 my_bool is_fake_change_enabled(THD *thd);
57- bool is_corrupt() const;
58
59 int write_row(uchar * buf);
60 int update_row(const uchar * old_data, uchar * new_data);

Subscribers

People subscribed via source and target branches