Merge lp:~percona-dev/percona-server/5.1.57-fix-bug723050 into lp:~percona-dev/percona-server/5.1.57

Proposed by Yasufumi Kinoshita on 2011-05-23
Status: Merged
Approved by: Vadim Tkachenko on 2011-05-24
Approved revision: 227
Merged at revision: 227
Proposed branch: lp:~percona-dev/percona-server/5.1.57-fix-bug723050
Merge into: lp:~percona-dev/percona-server/5.1.57
Diff against target: 109 lines (+10/-10)
5 files modified
i_s_innodb_buffer_pool_pages.patch (+3/-3)
innodb_admin_command_base.patch (+1/-1)
innodb_extra_rseg.patch (+1/-1)
innodb_show_sys_tables.patch (+3/-3)
innodb_stats.patch (+2/-2)
To merge this branch: bzr merge lp:~percona-dev/percona-server/5.1.57-fix-bug723050
Reviewer Review Type Date Requested Status
Vadim Tkachenko 2011-05-23 Approve on 2011-05-24
Stewart Smith (community) Approve on 2011-05-23
Review via email: mp+61908@code.launchpad.net
To post a comment you must log in.
Stewart Smith (stewart) :
review: Approve
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'i_s_innodb_buffer_pool_pages.patch'
2--- i_s_innodb_buffer_pool_pages.patch 2011-05-10 07:31:20 +0000
3+++ i_s_innodb_buffer_pool_pages.patch 2011-05-23 03:28:23 +0000
4@@ -618,7 +618,7 @@
5 +
6 + /* plugin author (for SHOW PLUGINS) */
7 + /* const char* */
8-+ STRUCT_FLD(author, plugin_author),
9++ STRUCT_FLD(author, "Percona"),
10 +
11 + /* general descriptive text (for SHOW PLUGINS) */
12 + /* const char* */
13@@ -667,7 +667,7 @@
14 +
15 + /* plugin author (for SHOW PLUGINS) */
16 + /* const char* */
17-+ STRUCT_FLD(author, plugin_author),
18++ STRUCT_FLD(author, "Percona"),
19 +
20 + /* general descriptive text (for SHOW PLUGINS) */
21 + /* const char* */
22@@ -716,7 +716,7 @@
23 +
24 + /* plugin author (for SHOW PLUGINS) */
25 + /* const char* */
26-+ STRUCT_FLD(author, plugin_author),
27++ STRUCT_FLD(author, "Percona"),
28 +
29 + /* general descriptive text (for SHOW PLUGINS) */
30 + /* const char* */
31
32=== modified file 'innodb_admin_command_base.patch'
33--- innodb_admin_command_base.patch 2011-03-30 09:41:24 +0000
34+++ innodb_admin_command_base.patch 2011-05-23 03:28:23 +0000
35@@ -149,7 +149,7 @@
36 + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
37 + STRUCT_FLD(info, &i_s_info),
38 + STRUCT_FLD(name, "XTRADB_ADMIN_COMMAND"),
39-+ STRUCT_FLD(author, plugin_author),
40++ STRUCT_FLD(author, "Percona"),
41 + STRUCT_FLD(descr, "XtraDB specific command acceptor"),
42 + STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
43 + STRUCT_FLD(init, i_s_innodb_admin_command_init),
44
45=== modified file 'innodb_extra_rseg.patch'
46--- innodb_extra_rseg.patch 2011-05-10 07:31:20 +0000
47+++ innodb_extra_rseg.patch 2011-05-23 03:28:23 +0000
48@@ -183,7 +183,7 @@
49 +
50 + /* plugin author (for SHOW PLUGINS) */
51 + /* const char* */
52-+ STRUCT_FLD(author, plugin_author),
53++ STRUCT_FLD(author, "Percona"),
54 +
55 + /* general descriptive text (for SHOW PLUGINS) */
56 + /* const char* */
57
58=== modified file 'innodb_show_sys_tables.patch'
59--- innodb_show_sys_tables.patch 2011-03-30 09:41:24 +0000
60+++ innodb_show_sys_tables.patch 2011-05-23 03:28:23 +0000
61@@ -673,7 +673,7 @@
62 + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
63 + STRUCT_FLD(info, &i_s_info),
64 + STRUCT_FLD(name, "INNODB_SYS_TABLES"),
65-+ STRUCT_FLD(author, plugin_author),
66++ STRUCT_FLD(author, "Percona"),
67 + STRUCT_FLD(descr, "InnoDB SYS_TABLES table"),
68 + STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
69 + STRUCT_FLD(init, i_s_innodb_sys_tables_init),
70@@ -689,7 +689,7 @@
71 + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
72 + STRUCT_FLD(info, &i_s_info),
73 + STRUCT_FLD(name, "INNODB_SYS_INDEXES"),
74-+ STRUCT_FLD(author, plugin_author),
75++ STRUCT_FLD(author, "Percona"),
76 + STRUCT_FLD(descr, "InnoDB SYS_INDEXES table"),
77 + STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
78 + STRUCT_FLD(init, i_s_innodb_sys_indexes_init),
79@@ -705,7 +705,7 @@
80 + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
81 + STRUCT_FLD(info, &i_s_info),
82 + STRUCT_FLD(name, "INNODB_SYS_STATS"),
83-+ STRUCT_FLD(author, plugin_author),
84++ STRUCT_FLD(author, "Percona"),
85 + STRUCT_FLD(descr, "InnoDB SYS_STATS table"),
86 + STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
87 + STRUCT_FLD(init, i_s_innodb_sys_stats_init),
88
89=== modified file 'innodb_stats.patch'
90--- innodb_stats.patch 2011-05-10 07:31:20 +0000
91+++ innodb_stats.patch 2011-05-23 03:28:23 +0000
92@@ -1322,7 +1322,7 @@
93 + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
94 + STRUCT_FLD(info, &i_s_info),
95 + STRUCT_FLD(name, "INNODB_TABLE_STATS"),
96-+ STRUCT_FLD(author, plugin_author),
97++ STRUCT_FLD(author, "Percona"),
98 + STRUCT_FLD(descr, "InnoDB table statistics in memory"),
99 + STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
100 + STRUCT_FLD(init, i_s_innodb_table_stats_init),
101@@ -1338,7 +1338,7 @@
102 + STRUCT_FLD(type, MYSQL_INFORMATION_SCHEMA_PLUGIN),
103 + STRUCT_FLD(info, &i_s_info),
104 + STRUCT_FLD(name, "INNODB_INDEX_STATS"),
105-+ STRUCT_FLD(author, plugin_author),
106++ STRUCT_FLD(author, "Percona"),
107 + STRUCT_FLD(descr, "InnoDB index statistics in memory"),
108 + STRUCT_FLD(license, PLUGIN_LICENSE_GPL),
109 + STRUCT_FLD(init, i_s_innodb_index_stats_init),

Subscribers

People subscribed via source and target branches