master-{user,host,port,password} no longer settable from mysqld.conf

[packages/mysql.git] / innodb_admin_command_base.patch

diff --git a/innodb_admin_command_base.patch b/innodb_admin_command_base.patch
index 8cb782b64e6295c9a0667331500521424ce5ae94..9177386335e944d8c6a4effb1d6342b1ff266409 100644 (file)
--- a/innodb_admin_command_base.patch
+++ b/innodb_admin_command_base.patch
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/storage/innobase/handler/ha_innodb.cc
 +++ b/storage/innobase/handler/ha_innodb.cc
-@@ -11880,7 +11880,8 @@
+@@ -12041,7 +12041,8 @@
  i_s_innodb_sys_foreign_cols,
  i_s_innodb_sys_stats,
  i_s_innodb_table_stats,
@@ -19,9 +19,9 @@
  /** @brief Initialize the default value of innodb_commit_concurrency.
 --- a/storage/innobase/handler/i_s.cc
 +++ b/storage/innobase/handler/i_s.cc
-@@ -4177,3 +4177,139 @@
-       STRUCT_FLD(system_vars, NULL),
-       STRUCT_FLD(__reserved1, NULL)
+@@ -4243,3 +4243,140 @@
+       STRUCT_FLD(__reserved1, NULL),
+       STRUCT_FLD(flags, 0UL)
  };
 +
 +/***********************************************************************
@@ -157,7 +157,8 @@
 +      STRUCT_FLD(version, 0x0100 /* 1.0 */),
 +      STRUCT_FLD(status_vars, NULL),
 +      STRUCT_FLD(system_vars, NULL),
-+      STRUCT_FLD(__reserved1, NULL)
++      STRUCT_FLD(__reserved1, NULL),
++      STRUCT_FLD(flags, 0UL)
 +};
 --- a/storage/innobase/handler/i_s.h
 +++ b/storage/innobase/handler/i_s.h
@@ -183,3 +184,24 @@
 +--source include/have_innodb.inc
 +select * from information_schema.XTRADB_ADMIN_COMMAND;
 +select * from information_schema.XTRADB_ADMIN_COMMAND /*!XTRA_HELLO*/;
+--- a/mysql-test/r/mysqld--help-notwin.result
++++ b/mysql-test/r/mysqld--help-notwin.result
+@@ -733,6 +733,10 @@
+  -V, --version       Output version information and exit.
+  --wait-timeout=#    The number of seconds the server waits for activity on a
+  connection before closing it
++ --xtradb-admin-command[=name] 
++ Enable or disable XTRADB_ADMIN_COMMAND plugin. Possible
++ values are ON, OFF, FORCE (don't start if the plugin
++ fails to load).
+ 
+ Variables (--variable-name=value)
+ abort-slave-event-count 0
+@@ -958,6 +962,7 @@
+ updatable-views-with-limit YES
+ verbose TRUE
+ wait-timeout 28800
++xtradb-admin-command ON
+ 
+ To see what values a running MySQL server is using, type
+ 'mysqladmin variables' instead of 'mysqld --verbose --help'.