Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: Ib9e34bf0610389d92210cd9987b619d38b86d27e

Author: rubikshift

storage/ndb/include/util/ndb_opts.h

@@ -106,9 +106,9 @@ OPT_EXTERN(const char *,opt_debug,= 0);
   {"connect-retries", NDB_OPT_NOSHORT, \
      "Set connection retries." \
      " This is the number of times the tool tries connecting" \
-     " to the cluster.", \
+     " to the cluster. -1 for eternal retries", \
      (uchar**) &opt_connect_retries, (uchar**) &opt_connect_retries, 0, GET_INT, \
-     REQUIRED_ARG, 12, 0, INT_MAX, 0, 0, 0}
+     REQUIRED_ARG, 12, -1, INT_MAX, 0, 0, 0}
 
 #ifndef NDEBUG
 #define NDB_STD_OPTS(prog_name) \

storage/ndb/src/kernel/main.cpp

@@ -49,8 +49,6 @@ static int opt_initial;
 static int opt_no_start;
 static unsigned opt_allocated_nodeid;
 static int opt_angel_pid;
-static int opt_retries;
-static int opt_delay;
 static unsigned long opt_logbuffer_size;
 
 extern NdbNodeBitmask g_nowait_nodes;
@@ -109,13 +107,11 @@ static struct my_option my_long_options[] =
     (uchar**) &opt_angel_pid, (uchar **) &opt_angel_pid, 0,
     GET_UINT, REQUIRED_ARG, 0, 0, UINT_MAX, 0, 0, 0 },
   { "connect-retries", 'r',
-    "Number of times mgmd is contacted at start. -1: eternal retries",
-    (uchar**) &opt_retries, (uchar**) &opt_retries, 0,
+    "Number of times mgmd is contacted at start. -1: eternal retries"
+    " NOTE: -r will be removed with the next release!"
+    " Use --connect-retries instead",
+    (uchar**) &opt_connect_retries, (uchar**) &opt_connect_retries, 0,
     GET_INT, REQUIRED_ARG, 12, -1, 65535, 0, 0, 0 },
-  { "connect-delay", NDB_OPT_NOSHORT,
-    "Number of seconds between each connection attempt",
-    (uchar**) &opt_delay, (uchar**) &opt_delay, 0,
-    GET_INT, REQUIRED_ARG, 5, 0, 3600, 0, 0, 0 },
   { "logbuffer-size", NDB_OPT_NOSHORT,
     "Size of the log buffer for data node ndb_x_out.log",
     (uchar**) &opt_logbuffer_size, (uchar**) &opt_logbuffer_size, 0,
@@ -137,6 +133,15 @@ static void short_usage_sub(void)
   ndb_service_print_options("ndbd");
 }
 
+static bool get_one_option(int optid, const struct my_option *opt,
+                                     char *argument) {
+  if (optid == 'r')
+    g_eventLogger->warning(
+        "NOTE: -r option will be removed in the next release!"
+        " Use --connect-retries instead.");
+  return ndb_std_get_one_option(optid, opt, argument);
+}
+
 /**
  * C++ Standard 3.6.1/3:
  *  The function main shall not be used (3.2) within a program.
@@ -180,7 +185,7 @@ real_main(int argc, char** argv)
   }
 
   int ho_error;
-  if ((ho_error=opts.handle_options()))
+  if ((ho_error=opts.handle_options(get_one_option)))
     exit(ho_error);
 
   if (opt_no_daemon || opt_foreground) {
@@ -225,7 +230,7 @@ real_main(int argc, char** argv)
     ndbd_run(opt_foreground, opt_report_fd,
              opt_ndb_connectstring, opt_ndb_nodeid, opt_bind_address,
              opt_no_start, opt_initial, opt_initialstart,
-             opt_allocated_nodeid, opt_retries, opt_delay,
+             opt_allocated_nodeid, opt_connect_retries, opt_connect_retry_delay,
              opt_logbuffer_size);
   }
 
@@ -244,8 +249,8 @@ real_main(int argc, char** argv)
             opt_initial,
             opt_no_start,
             opt_daemon,
-            opt_retries,
-            opt_delay);
+            opt_connect_retries,
+            opt_connect_retry_delay);
 
   return 1; // Never reached
 }