← Back to branch summary

~tsarev/percona-server/bug721176

« back to all changes in this revision

Viewing changes to patches/innodb_admin_command_base.patch

  • Committer: Stewart Smith
  • Date: 2011-08-16 02:52:57 UTC
  • mfrom: (148.1.5 5.5.15-porting)
  • Revision ID: stewart@flamingspork.com-20110816025257-0e7elba7i8tlrf50
merge 5.5.15 rebase

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/innodb_admin_command_base.patch
5
5
#!!! notice !!!
6
6
# Any small change to this file in the main branch
7
7
# should be done or reviewed by the maintainer!
8
 
diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
9
 
--- a/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:32:15.624039043 +0900
10
 
+++ b/storage/innobase/handler/ha_innodb.cc     2010-12-03 17:32:35.424957827 +0900
11
 
@@ -11881,7 +11881,8 @@
 
8
--- a/storage/innobase/handler/ha_innodb.cc
 
9
+++ b/storage/innobase/handler/ha_innodb.cc
 
10
@@ -11880,7 +11880,8 @@
12
11
 i_s_innodb_sys_foreign_cols,
13
12
 i_s_innodb_sys_stats,
14
13
 i_s_innodb_table_stats,
18
17
 mysql_declare_plugin_end;
19
18
 
20
19
 /** @brief Initialize the default value of innodb_commit_concurrency.
21
 
diff -ruN a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
22
 
--- a/storage/innobase/handler/i_s.cc   2010-12-03 17:30:16.299955549 +0900
23
 
+++ b/storage/innobase/handler/i_s.cc   2010-12-03 17:32:35.425989972 +0900
 
20
--- a/storage/innobase/handler/i_s.cc
 
21
+++ b/storage/innobase/handler/i_s.cc
24
22
@@ -4177,3 +4177,139 @@
25
23
        STRUCT_FLD(system_vars, NULL),
26
24
        STRUCT_FLD(__reserved1, NULL)
161
159
+       STRUCT_FLD(system_vars, NULL),
162
160
+       STRUCT_FLD(__reserved1, NULL)
163
161
+};
164
 
diff -ruN a/storage/innobase/handler/i_s.h b/storage/innobase/handler/i_s.h
165
 
--- a/storage/innobase/handler/i_s.h    2010-12-03 17:30:16.301987692 +0900
166
 
+++ b/storage/innobase/handler/i_s.h    2010-12-03 17:32:35.426954555 +0900
 
162
--- a/storage/innobase/handler/i_s.h
 
163
+++ b/storage/innobase/handler/i_s.h
167
164
@@ -46,5 +46,6 @@
168
165
 extern struct st_mysql_plugin  i_s_innodb_sys_stats;
169
166
 extern struct st_mysql_plugin  i_s_innodb_table_stats;