← Back to branch summary

~tsarev/percona-server/5.1.59-porting-bad

« back to all changes in this revision

Viewing changes to innodb_show_status.patch

  • Committer: kinoyasu
  • Date: 2011-07-07 13:02:19 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: kinoyasu@gauntlet4-20110707130219-bev0gkkvwkh47u4m
Yasufumi patches are ported to 5.1.58. Removing/changing the patch files against my intention is not allowed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_show_status.patch
67
67
diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
68
68
--- a/storage/innodb_plugin/handler/ha_innodb.cc        2010-04-29 15:28:20.000000000 +0900
69
69
+++ b/storage/innodb_plugin/handler/ha_innodb.cc        2010-04-29 15:28:56.000000000 +0900
70
 
@@ -10821,6 +10821,16 @@
 
70
@@ -10817,6 +10817,16 @@
71
71
   "Force InnoDB to not use next-key locking, to use only row-level locking.",
72
72
   NULL, NULL, FALSE);
73
73
 
84
84
 #ifdef UNIV_LOG_ARCHIVE
85
85
 static MYSQL_SYSVAR_STR(log_arch_dir, innobase_log_arch_dir,
86
86
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
87
 
@@ -11003,7 +11013,7 @@
 
87
@@ -10999,7 +11009,7 @@
88
88
 
89
89
 static MYSQL_SYSVAR_STR(version, innodb_version_str,
90
90
   PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_READONLY,
93
93
 
94
94
 static MYSQL_SYSVAR_BOOL(use_sys_malloc, srv_use_sys_malloc,
95
95
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
96
 
@@ -11089,6 +11099,8 @@
 
96
@@ -11085,6 +11095,8 @@
97
97
   MYSQL_SYSVAR(thread_concurrency),
98
98
   MYSQL_SYSVAR(thread_sleep_delay),
99
99
   MYSQL_SYSVAR(autoinc_lock_mode),