*** ./sql/sys_vars.cc.orig      2014-01-15 00:38:00.000000000 +0900
--- ./sql/sys_vars.cc   2014-03-25 18:22:22.764811060 +0900
***************
*** 474,479 ****
--- 474,485 ----
         DEFAULT(-1),
         BLOCK_SIZE(1), PFS_TRAILING_PROPERTIES);

+ static Sys_var_mybool Sys_pfs_setup_actors_fill_default_value(
+        "performance_schema_setup_actors_fill_default_value",
+        "Fill performance_schema.setup_actors hardcoded default value on startup.",
+        READ_ONLY NOT_VISIBLE GLOBAL_VAR(pfs_param.m_setup_actors_fill_default_value),
+        CMD_LINE(OPT_ARG), DEFAULT(TRUE),
+        PFS_TRAILING_PROPERTIES);
  /**
    Variable performance_schema_max_statement_classes.
    The default number of statement classes is the sum of:
*** ./storage/perfschema/pfs_defaults.cc.orig   2014-01-15 00:38:00.000000000 +0900
--- ./storage/perfschema/pfs_defaults.cc        2014-03-25 18:23:25.289844643 +0900
***************
*** 43,49 ****

    String percent("%", 1, &my_charset_utf8_bin);
    /* Enable all users on all hosts by default */
!   insert_setup_actor(&percent, &percent, &percent);

    /* Disable system tables by default */
    String mysql_db("mysql", 5, &my_charset_utf8_bin);
--- 43,50 ----

    String percent("%", 1, &my_charset_utf8_bin);
    /* Enable all users on all hosts by default */
!   if (pfs_param.m_setup_actors_fill_default_value)
!     insert_setup_actor(&percent, &percent, &percent);

    /* Disable system tables by default */
    String mysql_db("mysql", 5, &my_charset_utf8_bin);
*** storage/perfschema/pfs_server.h.orig        2014-01-15 00:38:00.000000000 +0900
--- storage/perfschema/pfs_server.h     2014-03-25 18:25:37.334818612 +0900
***************
*** 199,204 ****
--- 199,206 ----

    /** Sizing hints, for auto tuning. */
    PFS_sizing_hints m_hints;
+
+   bool m_setup_actors_fill_default_value;
  };

  /**