Merge bb-10.2-ext into 10.3

.gitignore

@@ -193,6 +193,7 @@ storage/myisam/sp_test
 storage/rocksdb/ldb
 storage/rocksdb/mysql_ldb
 storage/rocksdb/sst_dump
+storage/rocksdb/rdb_source_revision.h
 storage/tokudb/PerconaFT/buildheader/db.h
 storage/tokudb/PerconaFT/buildheader/make_tdb
 storage/tokudb/PerconaFT/buildheader/runcat.sh

appveyor.yml

@@ -0,0 +1,17 @@
+version: 10.2-{build}
+before_build:
+- md %APPVEYOR_BUILD_FOLDER%\win_build
+- cd %APPVEYOR_BUILD_FOLDER%\win_build
+- cmake ..  -G "Visual Studio 15 2017" -DBISON_EXECUTABLE=C:\cygwin\bin\bison
+- dir
+build:
+  project: win_build\MySQL.sln
+  parallel: true
+  verbosity: minimal
+configuration:
+  - Debug
+test:
+test_script:
+- cd %APPVEYOR_BUILD_FOLDER%\win_build\mysql-test
+- perl mysql-test-run.pl --force --max-test-fail=20 --parallel=6 --testcase-timeout=4 --skip-test-list=unstable-tests --suite=main,innodb,plugins,mariabackup
+image: Visual Studio 2017

client/client_priv.h

@@ -98,6 +98,7 @@ enum options_client
   OPT_REPORT_PROGRESS,
   OPT_SKIP_ANNOTATE_ROWS_EVENTS,
   OPT_SSL_CRL, OPT_SSL_CRLPATH,
+  OPT_PRINT_ROW_COUNT, OPT_PRINT_ROW_EVENT_POSITIONS,
   OPT_MAX_CLIENT_OPTION /* should be always the last */
 };
 

client/mysql.cc

@@ -1795,8 +1795,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     break;
   case OPT_MYSQL_PROTOCOL:
 #ifndef EMBEDDED_LIBRARY
-    opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
-                                    opt->name);
+    if ((opt_protocol= find_type_with_warning(argument, &sql_protocol_typelib,
+                                              opt->name)) <= 0)
+    {
+      sf_leaking_memory= 1; /* no memory leak reports here */
+      exit(1);
+    }
 #endif
     break;
   case OPT_SERVER_ARG:

client/mysqladmin.cc

@@ -299,8 +299,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 #endif
     break;
   case OPT_MYSQL_PROTOCOL:
-    opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
-                                    opt->name);
+    if ((opt_protocol= find_type_with_warning(argument, &sql_protocol_typelib,
+                                              opt->name)) <= 0)
+    {
+      sf_leaking_memory= 1; /* no memory leak reports here */
+      exit(1);
+    }
     break;
   }
   return 0;