MWL#234: After-review fixes, including better names for the new system variables.

1 files changed, 9 insertions, 8 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e966b35a556..a4477ba58e8 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -553,7 +553,7 @@ uint    opt_large_page_size= 0;
 uint    opt_debug_sync_timeout= 0;
 #endif /* defined(ENABLED_DEBUG_SYNC) */
 my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
-my_bool opt_replicate_ignore_do_not_replicate;
+my_bool opt_replicate_events_marked_for_skip;
 
 /*
   True if there is at least one per-hour limit for some user, so we should
@@ -5935,6 +5935,7 @@ enum options_mysqld
   OPT_SAFEMALLOC_MEM_LIMIT,    OPT_REPLICATE_DO_TABLE,
   OPT_REPLICATE_IGNORE_TABLE,  OPT_REPLICATE_WILD_DO_TABLE,
   OPT_REPLICATE_WILD_IGNORE_TABLE, OPT_REPLICATE_SAME_SERVER_ID,
+  OPT_REPLICATE_EVENTS_MARKED_FOR_SKIP,
   OPT_DISCONNECT_SLAVE_EVENT_COUNT, OPT_TC_HEURISTIC_RECOVER,
   OPT_ABORT_SLAVE_EVENT_COUNT,
   OPT_LOG_BIN_TRUST_FUNCTION_CREATORS,
@@ -6087,8 +6088,7 @@ enum options_mysqld
   OPT_IGNORE_BUILTIN_INNODB,
   OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
   OPT_DEFAULT_CHARACTER_SET_OLD,
-  OPT_MAX_LONG_DATA_SIZE,
-  OPT_REPLICATE_IGNORE_DO_NOT_REPLICATE
+  OPT_MAX_LONG_DATA_SIZE
 };
 
 
@@ -6785,11 +6785,12 @@ each time the SQL thread starts.",
    "cross database updates. If you need cross database updates to work, "
    "make sure you have 3.23.28 or later, and use replicate-wild-ignore-"
    "table=db_name.%. ", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"replicate-ignore-do-not-replicate", OPT_REPLICATE_IGNORE_DO_NOT_REPLICATE,
-   "Tells the slave thread not to replicate events that were created with"
-   "@@do_not_replicat=1.", &opt_replicate_ignore_do_not_replicate,
-   &opt_replicate_ignore_do_not_replicate, 0, GET_BOOL, NO_ARG,
-   0, 0, 0 ,0, 0, 0},
+  {"replicate-events-marked-for-skip", OPT_REPLICATE_EVENTS_MARKED_FOR_SKIP,
+   "Tells the slave thread to replicate events that were created with"
+   "@@skip_replication=1. Default true. If set to false, such events will not"
+   "be replicated.", &opt_replicate_events_marked_for_skip,
+   &opt_replicate_events_marked_for_skip, 0, GET_BOOL, NO_ARG,
+   1, 0, 0 ,0, 0, 0},
   {"replicate-ignore-table", OPT_REPLICATE_IGNORE_TABLE,
    "Tells the slave thread to not replicate to the specified table. To specify "
    "more than one table to ignore, use the directive multiple times, once for "