System Versioning 1.0 pre8

Merge branch '10.3' into trunk

.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

.travis.compiler.sh

@@ -14,6 +14,10 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then
     export CXX CC=${CXX/++/}
   elif [[ "${CXX}" == 'g++' ]]; then
     CMAKE_OPT=""
+    if [[ "${MYSQL_TEST_SUITES}" == 'rpl' ]]; then
+      CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_TOKUDB_STORAGE_ENGINE=TRUE"
+      CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_MROONGA_STORAGE_ENGINE=TRUE"
+    fi
     export CXX=g++-${GCC_VERSION}
     export CC=gcc-${GCC_VERSION}
   fi
@@ -33,6 +37,9 @@ else
   if which ccache ; then
     CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
   fi
+  if [[ "${MYSQL_TEST_SUITES}" == 'rpl' ]]; then
+    CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_TOKUDB_STORAGE_ENGINE=ON"
+  fi
   CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_MROONGA_STORAGE_ENGINE=ON"
   if [[ "${TYPE}" == "Debug" ]]; then
     CMAKE_OPT="${CMAKE_OPT} -DWITHOUT_TOKUDB_STORAGE_ENGINE=ON"

Docs/sp-imp-spec.txt

@@ -103,7 +103,7 @@
     - Statements:
         The Lex in THD is replaced by a new Lex structure and the statement,
         is parsed as usual. A sp_instr_stmt is created, containing the new
-        Lex, and added to added to the instructions in  sphead.
+        Lex, and added to the instructions in  sphead.
         Afterwards, the procedure's Lex is restored in THD.
     - SET var:
         Setting a local variable generates a sp_instr_set instruction,
@@ -169,7 +169,7 @@
 
   - Parsing CREATE FUNCTION ...
 
-    Creating a functions is essensially the same thing as for a PROCEDURE,
+    Creating a functions is essentially the same thing as for a PROCEDURE,
     with the addition that a FUNCTION has a return type and a RETURN
     statement, but no OUT or INOUT parameters.
 
@@ -189,7 +189,7 @@
     additional requirement. They will be called in expressions with the same
     syntax as UDFs, so UDFs and stored FUNCTIONs share the namespace. Thus,
     we must make sure that we do not have UDFs and FUNCTIONs with the same
-    name (even if they are storded in different places).
+    name (even if they are stored in different places).
 
     This means that we can reparse the procedure as many time as we want.
     The first time, the resulting Lex is used to store the procedure in
@@ -225,7 +225,7 @@
 
     sql_parse.cc:mysql_execute_command() then uses sp.cc:sp_find() to
     get the sp_head for the procedure (which may have been read from the
-    database or feetched from the in-memory cache) and calls the sp_head's
+    database or fetched from the in-memory cache) and calls the sp_head's
     method execute().
     Note: It's important that substatements called by the procedure do not
           do send_ok(). Fortunately, there is a flag in THD->net to disable
@@ -545,7 +545,7 @@
        Cons: Uses more memory, each SP read from table once per thread.
 
     Unfortunately, we cannot use alternative 1 for the time being, as most
-    of the datastructures to be cached (lex and items) are not reentrant
+    of the data structures to be cached (lex and items) are not reentrant
     and thread-safe. (Things are modifed at execution, we have THD pointers
     stored everywhere, etc.)
     This leaves us with alternative 2, one cache per thread; or actually

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=3
-MYSQL_VERSION_PATCH=3
+MYSQL_VERSION_PATCH=4
 SERVER_MATURITY=beta

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;