Bug#11747227: --CONNECT_TIMEOUT AND --WAIT KEYS ARE NOT TAKE EFFECT

Mysql client does not handle documented --wait command line parameter.

Change-Id: I7af489a96d082c628399071ead30a0a7cec4f509

Author: MRajcic

client/mysql.cc

@@ -1986,8 +1986,8 @@ static struct my_option my_long_options[] = {
      nullptr},
     {"version", 'V', "Output version information and exit.", nullptr, nullptr,
      nullptr, GET_NO_ARG, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
-    {"wait", 'w', "Wait and retry if connection is down.", nullptr, nullptr,
-     nullptr, GET_NO_ARG, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
+    {"wait", 'w', "Wait and retry if connection is down.", &wait_flag,
+     &wait_flag, nullptr, GET_BOOL, NO_ARG, 0, 0, 0, nullptr, 0, nullptr},
     {"connect_timeout", OPT_CONNECT_TIMEOUT,
      "Number of seconds before connection timeout.", &opt_connect_timeout,
      &opt_connect_timeout, nullptr, GET_ULONG, REQUIRED_ARG, 0, 0, 3600 * 12,
@@ -5209,8 +5209,16 @@ static int sql_connect(char *host, char *database, char *user, uint silent) {
       }
       return error;
     }
+    // exit after single try if no --wait flag
     if (!wait_flag) return ignore_errors ? -1 : 1;
-    if (!message && !silent) {
+    // exit after two tries if --wait, but no --force flag provided
+    if (!ignore_errors && count > 0) {
+      tee_fputs("\n", stderr);
+      (void)fflush(stderr);
+      return 1;
+    }
+
+    if (!message && (!silent || verbose)) {
       message = true;
       tee_fputs("Waiting", stderr);
       (void)fflush(stderr);
@@ -5219,8 +5227,8 @@ static int sql_connect(char *host, char *database, char *user, uint silent) {
     if (!silent) {
       putc('.', stderr);
       (void)fflush(stderr);
-      count++;
     }
+    count++;
   }
 }
 

mysql-test/r/mysql_wait.result

@@ -0,0 +1,9 @@
+#
+# Bug#11747227: --CONNECT_TIMEOUT AND --WAIT KEYS ARE NOT TAKE EFFECT
+#
+Test --wait with unavailable server host
+include/assert_grep.inc [Found Waiting line in mysql client log]
+Test --wait with unresolvable server host name
+include/assert_grep.inc [No Waiting line in mysql client log]
+
+End of tests

mysql-test/t/mysql_wait.test

@@ -0,0 +1,36 @@
+--echo #
+--echo # Bug#11747227: --CONNECT_TIMEOUT AND --WAIT KEYS ARE NOT TAKE EFFECT
+--echo #
+
+# test --wait flag
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQL_LOG= $MYSQLD_DATADIR/mysql_wait_output.log;
+
+# Wait should attempt a single retry on connectivity issues to a resolvable, but unavailable host
+# (simulated with unused IPv4 numeric address and port combination)
+# Use -v to output "Waiting" line (to assert retry actually happened)
+--echo Test --wait with unavailable server host
+--error 1
+--exec $MYSQL -v --wait --host=0.0.0.0 --port=1 -e "SELECT 1;" 2>$MYSQL_LOG
+
+--let $assert_text= Found Waiting line in mysql client log
+--let $assert_select= Waiting
+--let $assert_file= $MYSQL_LOG
+--let $assert_count= 1
+--source include/assert_grep.inc
+
+# Wait should immediately fail on connectivity issues to unresolvable host name (no retries)
+--echo Test --wait with unresolvable server host name
+--error 1
+--exec $MYSQL -v --wait --host=invalid -e "SELECT 1;" 2>$MYSQL_LOG
+
+--let $assert_text= No Waiting line in mysql client log
+--let $assert_select= Waiting
+--let $assert_file= $MYSQL_LOG
+--let $assert_count= 0
+--source include/assert_grep.inc
+
+remove_file $MYSQL_LOG;
+
+--echo
+--echo End of tests