Merge branch 'release/2.0.4'

Author: rusher

.eslintrc

@@ -2,17 +2,21 @@
   "globals": {
     "expect": true
   },
-  "extends": [
-    "prettier"
-  ],
   "plugins": [
     "markdown"
   ],
+  "extends": [
+    "prettier",
+    "plugin:prettier/recommended"
+  ],
   "parserOptions": {
     "ecmaVersion": 6
   },
   "env": {
     "node": true,
      "es6": true
+  },
+  "rules": {
+    "linebreak-style": ["error", "unix"]
   }
 }

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "printWidth":  80,
+  "semi": true,
+  "singleQuote": true,
+  "endOfLine": "lf"
+}

.travis.yml

@@ -15,19 +15,20 @@ before_install:
 - chmod +x .travis/script.sh
 
 install:
-# generate SSL certificates
-- mkdir tmp
-- chmod +x .travis/gen-ssl.sh
-- chmod +x .travis/build/build.sh
-- chmod +x .travis/build/docker-entrypoint.sh
-- chmod 777 .travis/build/
-- .travis/gen-ssl.sh mariadb.example.com tmp
-- export PROJ_PATH=`pwd`
-- export SSLCERT=$PROJ_PATH/tmp
-- export TEST_SSL_CA_FILE=$SSLCERT/server.crt
-- export TEST_SSL_CLIENT_KEY_FILE=$SSLCERT/client.key
-- export TEST_SSL_CLIENT_CERT_FILE=$SSLCERT/client.crt
-- export TEST_SSL_CLIENT_KEYSTORE_FILE=$SSLCERT/client-keystore.p12
+  - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
+  # generate SSL certificates
+  - mkdir tmp
+  - chmod +x .travis/gen-ssl.sh
+  - chmod +x .travis/build/build.sh
+  - chmod +x .travis/build/docker-entrypoint.sh
+  - chmod 777 .travis/build/
+  - .travis/gen-ssl.sh mariadb.example.com tmp
+  - export PROJ_PATH=`pwd`
+  - export SSLCERT=$PROJ_PATH/tmp
+  - export TEST_SSL_CA_FILE=$SSLCERT/server.crt
+  - export TEST_SSL_CLIENT_KEY_FILE=$SSLCERT/client.key
+  - export TEST_SSL_CLIENT_CERT_FILE=$SSLCERT/client.crt
+  - export TEST_SSL_CLIENT_KEYSTORE_FILE=$SSLCERT/client-keystore.p12
 
 env:
   global:
@@ -80,7 +81,7 @@ notifications:
 script:
 - npm install
 - npm install nyc -g
-- .travis/script.sh
+- travis_retry .travis/script.sh
 
 after_success:
 - if [ -z "$BENCH" ] ; then npm run coverage:report; fi

.travis/build/Dockerfile

@@ -1,8 +1,22 @@
-FROM debian:jessie
+# vim:set ft=dockerfile:
+FROM ubuntu:bionic
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r mysql && useradd -r -g mysql mysql
 
+# https://bugs.debian.org/830696 (apt uses gpgv by default in newer releases, rather than gpg)
+RUN set -ex; \
+	apt-get update; \
+	if ! which gpg; then \
+		apt-get install -y --no-install-recommends gnupg; \
+	fi; \
+# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
+# so, if we're not running gnupg 1.x, explicitly install dirmngr too
+	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
+		 apt-get install -y --no-install-recommends dirmngr; \
+	fi; \
+	rm -rf /var/lib/apt/lists/*
+
 # add gosu for easy step-down from root
 ENV GOSU_VERSION 1.10
 RUN set -ex; \
@@ -21,8 +35,9 @@ RUN set -ex; \
 	\
 # verify the signature
 	export GNUPGHOME="$(mktemp -d)"; \
-	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+	gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
 	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+	command -v gpgconf > /dev/null && gpgconf --kill all || :; \
 	rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
 	\
 	chmod +x /usr/local/bin/gosu; \
@@ -37,27 +52,29 @@ RUN mkdir /docker-entrypoint-initdb.d
 # install "apt-transport-https" for Percona's repo (switched to https-only)
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		apt-transport-https ca-certificates \
+		tzdata \
 		pwgen \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN { \
-		echo "mariadb-server-10.3" mysql-server/root_password password 'unused'; \
-		echo "mariadb-server-10.3" mysql-server/root_password_again password 'unused'; \
+		echo "mariadb-server-10.4" mysql-server/root_password password 'unused'; \
+		echo "mariadb-server-10.4" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections
 
 RUN apt-get update -y
 RUN apt-get install -y software-properties-common wget
 RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
-RUN echo 'deb http://yum.mariadb.org/galera/repo/deb jessie main' > /etc/apt/sources.list.d/galera-test-repo.list
+RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net F1656F24C74CD1D8
+RUN echo 'deb http://yum.mariadb.org/galera/repo/deb bionic main' > /etc/apt/sources.list.d/galera-test-repo.list
 RUN apt-get update -y
 
-RUN apt-get install -y curl libdbi-perl rsync socat galera3 libnuma1 libaio1 zlib1g-dev libreadline5 libjemalloc1 libsnappy1 libcrack2
+RUN apt-get install -y curl libdbi-perl rsync socat galera3 libnuma1 libaio1 zlib1g-dev libreadline5 libjemalloc1 libsnappy1v5 libcrack2
 
 COPY *.deb /root/
 RUN chmod 777 /root/*
 
-RUN dpkg -R --install /root/mysql-common*
-RUN dpkg -R --install /root/mariadb-common*
+RUN dpkg --install /root/mysql-common*
+RUN dpkg --install /root/mariadb-common*
 RUN dpkg -R --unpack /root/
 RUN apt-get install -f -y
 

.travis/build/build.sh

@@ -4,22 +4,22 @@ echo "**************************************************************************
 echo "* searching for last complete build"
 echo "**************************************************************************"
 
-wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.3/
+wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.4/
 grep -o ">build-[0-9]*" index.html | grep -o "[0-9]*" | tac | while read -r line ; do
 
-  curl -s --head http://hasky.askmonty.org/archive/10.3/build-$line/kvm-deb-jessie-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
+  curl -s --head http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
   if [ $? = "0" ]; then
     echo "**************************************************************************"
     echo "* Processing $line"
     echo "**************************************************************************"
-    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.3/build-$line/kvm-deb-jessie-amd64/debs/binary/
+    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/debs/binary/
     grep -o ">[^\"]*\.deb" $line.html | grep -o "[^>]*\.deb" | while read -r file ; do
         if  [[ "$file" =~ ^mariadb-plugin.* ]] ;
         then
           echo "skipped file: $file"
         else
           echo "download file: $file"
-          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.3/build-$line/kvm-deb-jessie-amd64/debs/binary/$file
+          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/debs/binary/$file
         fi
     done
 

.travis/build/docker-entrypoint.sh

@@ -44,10 +44,8 @@ _check_config() {
 	toRun=( "$@" --verbose --help --log-bin-index="$(mktemp -u)" )
 	if ! errors="$("${toRun[@]}" 2>&1 >/dev/null)"; then
 		cat >&2 <<-EOM
-
 			ERROR: mysqld failed while attempting to check config
 			command was: "${toRun[*]}"
-
 			$errors
 		EOM
 		exit 1
@@ -59,15 +57,17 @@ _check_config() {
 # latter only show values present in config files, and not server defaults
 _get_config() {
 	local conf="$1"; shift
-	"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null | awk '$1 == "'"$conf"'" { print $2; exit }'
+	"$@" --verbose --help --log-bin-index="$(mktemp -u)" 2>/dev/null \
+		| awk '$1 == "'"$conf"'" && /^[^ \t]/ { sub(/^[^ \t]+[ \t]+/, ""); print; exit }'
+	# match "datadir      /some/path with/spaces in/it here" but not "--xyz=abc\n     datadir (xyz)"
 }
 
 # allow the container to be started with `--user`
 if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then
 	_check_config "$@"
 	DATADIR="$(_get_config 'datadir' "$@")"
 	mkdir -p "$DATADIR"
-	chown -R mysql:mysql "$DATADIR"
+	find "$DATADIR" \! -user mysql -exec chown mysql '{}' +
 	exec gosu mysql "$BASH_SOURCE" "$@"
 fi
 
@@ -88,7 +88,15 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		mkdir -p "$DATADIR"
 
 		echo 'Initializing database'
-		mysql_install_db --datadir="$DATADIR" --rpm
+		installArgs=( --datadir="$DATADIR" --rpm )
+		if { mysql_install_db --help || :; } | grep -q -- '--auth-root-authentication-method'; then
+			# beginning in 10.4.3, install_db uses "socket" which only allows system user root to connect, switch back to "normal" to allow mysql root without a password
+			# see https://github.com/MariaDB/server/commit/b9f3f06857ac6f9105dc65caae19782f09b47fb3
+			# (this flag doesn't exist in 10.0 and below)
+			installArgs+=( --auth-root-authentication-method=normal )
+		fi
+		# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
+		mysql_install_db "${installArgs[@]}" "${@:2}"
 		echo 'Database initialized'
 
 		SOCKET="$(_get_config 'socket' "$@")"
@@ -135,7 +143,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			-- What's done in this file shouldn't be replicated
 			--  or products like mysql-fabric won't work
 			SET @@SESSION.SQL_LOG_BIN=0;
-
 			DELETE FROM mysql.user WHERE user NOT IN ('mysql.sys', 'mysqlxsys', 'root') OR host NOT IN ('localhost') ;
 			SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASSWORD}') ;
 			GRANT ALL ON *.* TO 'root'@'localhost' WITH GRANT OPTION ;
@@ -162,8 +169,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			if [ "$MYSQL_DATABASE" ]; then
 				echo "GRANT ALL ON \`$MYSQL_DATABASE\`.* TO '$MYSQL_USER'@'%' ;" | "${mysql[@]}"
 			fi
-
-			echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}"
 		fi
 
 		echo

benchmarks/benchmarkOne.js

@@ -1,26 +1,26 @@
-"use strict";
+'use strict';
 
-const fs = require("fs");
-const Bench = require("./common_benchmarks");
+const fs = require('fs');
+const Bench = require('./common_benchmarks');
 let bench;
 
 const launchBenchs = function(path) {
   bench = new Bench();
 
-  const test = "bench_promise_insert_batch.js";
-  const m = require(path + "/" + test);
+  const test = 'bench_promise_insert_batch.js';
+  const m = require(path + '/' + test);
   bench.initFcts.push(m.initFct);
   bench.add(m.title, m.displaySql, m.benchFct, m.onComplete, m.promise, m.pool); //, bench.CONN.MYSQL);
 
   bench.suiteReady();
 };
 
-fs.access("./benchs", function(err) {
+fs.access('../benchs', function(err) {
   if (err) {
-    fs.access("./benchmarks/benchs", function(err) {
-      launchBenchs("./benchmarks/benchs");
+    fs.access('../benchmarks/benchs', function(err) {
+      launchBenchs('../benchmarks/benchs');
     });
   } else {
-    launchBenchs("./benchs");
+    launchBenchs('../benchs');
   }
 });

benchmarks/benchmarks.js

@@ -1,7 +1,7 @@
-"use strict";
+'use strict';
 
-const fs = require("fs");
-const Bench = require("./common_benchmarks");
+const fs = require('fs');
+const Bench = require('./common_benchmarks');
 const launchBenchs = function(path) {
   fs.readdir(path, function(err, list) {
     if (err) {
@@ -11,21 +11,28 @@ const launchBenchs = function(path) {
     const bench = new Bench();
     //launch all benchmarks
     for (let i = 0; i < list.length; i++) {
-      console.log("benchmark: ./benchs/" + list[i]);
-      const m = require("./benchs/" + list[i]);
+      console.log('benchmark: ./benchs/' + list[i]);
+      const m = require('./benchs/' + list[i]);
       bench.initFcts.push(m.initFct);
-      bench.add(m.title, m.displaySql, m.benchFct, m.onComplete, m.promise, m.pool);
+      bench.add(
+        m.title,
+        m.displaySql,
+        m.benchFct,
+        m.onComplete,
+        m.promise,
+        m.pool
+      );
     }
     bench.suiteReady();
   });
 };
-fs.access("./benchs", function(err) {
+fs.access('./benchs', function(err) {
   if (err) {
-    fs.access("./benchmarks/benchs", function(err) {
+    fs.access('./benchmarks/benchs', function(err) {
       if (err) return;
-      launchBenchs("./benchmarks/benchs");
+      launchBenchs('./benchmarks/benchs');
     });
   } else {
-    launchBenchs("./benchs");
+    launchBenchs('./benchs');
   }
 });

benchmarks/benchs/bench_do.js

@@ -1,13 +1,17 @@
-const assert = require("assert");
+const assert = require('assert');
 
-module.exports.title = "do ? using callback";
-module.exports.displaySql = "do ?";
+module.exports.title = 'do ? using callback';
+module.exports.displaySql = 'do ?';
 module.exports.promise = false;
 module.exports.benchFct = function(conn, deferred) {
-  conn.query("do ?", ["" + Math.floor(Math.random() * 50000000)], (err, res) => {
-    if (err) throw err;
-    // let val = Array.isArray(rows) ? rows[0] : rows;
-    // assert.equal(1, val.info ? val.info.affectedRows : val.affectedRows);
-    deferred.resolve();
-  });
+  conn.query(
+    'do ?',
+    ['' + Math.floor(Math.random() * 50000000)],
+    (err, res) => {
+      if (err) throw err;
+      // let val = Array.isArray(rows) ? rows[0] : rows;
+      // assert.equal(1, val.info ? val.info.affectedRows : val.affectedRows);
+      deferred.resolve();
+    }
+  );
 };

benchmarks/benchs/bench_promise_do.js

@@ -1,11 +1,11 @@
-const assert = require("assert");
+const assert = require('assert');
 
-module.exports.title = "do ? using promise";
-module.exports.displaySql = "do ?";
+module.exports.title = 'do ? using promise';
+module.exports.displaySql = 'do ?';
 module.exports.promise = true;
 module.exports.benchFct = function(conn, deferred) {
   conn
-    .query("do ?", ["" + Math.floor(Math.random() * 50000000)])
+    .query('do ?', ['' + Math.floor(Math.random() * 50000000)])
     .then(rows => {
       // let val = Array.isArray(rows) ? rows[0] : rows;
       // assert.equal(1, val.info ? val.info.affectedRows : val.affectedRows);