Merge pull request #134

Address MySQL bug #93276 and update Travis testing

Author: pali

.travis.yml

@@ -110,6 +110,8 @@ matrix:
       env: DB=MySQL VERSION=5.6.41
     - perl: "5.22"
       env: DB=MySQL VERSION=5.6.42
+    - perl: "5.22"
+      env: DB=MySQL VERSION=5.6.43
     - perl: "5.22"
       env: DB=MySQL VERSION=5.7.8-rc
     - perl: "5.22"
@@ -132,6 +134,8 @@ matrix:
       env: DB=MySQL VERSION=5.7.23
     - perl: "5.22"
       env: DB=MySQL VERSION=5.7.24
+    - perl: "5.22"
+      env: DB=MySQL VERSION=5.7.25
     - perl: "5.22"
       env: DB=MySQL VERSION=8.0.0-dmr
     - perl: "5.22"
@@ -148,6 +152,10 @@ matrix:
       env: DB=MySQL VERSION=8.0.12
     - perl: "5.22"
       env: DB=MySQL VERSION=8.0.13
+    - perl: "5.22"
+      env: DB=MySQL VERSION=8.0.14
+    - perl: "5.22"
+      env: DB=MySQL VERSION=8.0.15
     - perl: "5.22"
       env: DB=MariaDB VERSION=5.5.40
     - perl: "5.22"
@@ -174,6 +182,8 @@ matrix:
       env: DB=MariaDB VERSION=5.5.61
     - perl: "5.22"
       env: DB=MariaDB VERSION=5.5.62
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=5.5.63
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.0.14
     - perl: "5.22"
@@ -198,6 +208,8 @@ matrix:
       env: DB=MariaDB VERSION=10.0.36
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.0.37
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.0.38
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.1.2
     - perl: "5.22"
@@ -220,6 +232,8 @@ matrix:
       env: DB=MariaDB VERSION=10.1.36
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.1.37
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.1.38
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.2.0
     - perl: "5.22"
@@ -259,6 +273,8 @@ matrix:
       env: DB=MariaDB VERSION=10.2.20
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.2.21
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.2.22
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.3.0
     - perl: "5.22"
@@ -285,6 +301,8 @@ matrix:
       env: DB=MariaDB VERSION=10.4.0
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.4.1
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.4.2
     - perl: "5.22"
       env: CONC_DB=MySQL CONC_VERSION=6.0.0-beta
     - perl: "5.22"
@@ -338,6 +356,10 @@ matrix:
       env: CONC_DB=MariaDB CONC_VERSION=3.0.6
     - perl: "5.22"
       env: CONC_DB=MariaDB CONC_VERSION=3.0.7
+    - perl: "5.22"
+      env: CONC_DB=MariaDB CONC_VERSION=3.0.8
+    - perl: "5.22"
+      env: CONC_DB=MariaDB CONC_VERSION=3.0.9
     - perl: "5.22"
       env: DB=MySQL VERSION=5.0.96 CONC_DB=MariaDB CONC_VERSION=2.3.4
     - perl: "5.22"
@@ -413,7 +435,7 @@ before_install:
       mkdir -p "$SANDBOX_HOME" || exit 1 ;
       ln -s "$SANDBOX_CACHE_FILE" "$SANDBOX_FILE" || exit 1 ;
       if [ `echo "$VERSION" | sed 's/\.//;s/\..*//'` -ge 55 ]; then
-        SANDBOX_OPTIONS="$SANDBOX_OPTIONS --init_options=--innodb_use_native_aio=0 --my_clause=innodb_use_native_aio=0" ;
+        SANDBOX_OPTIONS="$SANDBOX_OPTIONS --init_options=--innodb_use_native_aio=0 --my_clause=innodb_use_native_aio=0 --my_clause=performance_schema=ON" ;
       fi ;
     fi
   - if [ "$CONC_DB" = "MySQL" ]; then

dbdimp.h

@@ -335,9 +335,9 @@ PERL_STATIC_INLINE UV SvUV_nomg(pTHX_ SV *sv)
 /*
  * MySQL and MariaDB Embedded are affected by https://jira.mariadb.org/browse/MDEV-16578
  * MariaDB 10.2.2+ prior to 10.2.19 and 10.3.9 and MariaDB Connector/C prior to 3.0.5 are affected by https://jira.mariadb.org/browse/CONC-336
- * MySQL 8.0.4+ is affected too by https://bugs.mysql.com/bug.php?id=93276
+ * MySQL 8.0.4+ prior to 8.0.15 is affected too by https://bugs.mysql.com/bug.php?id=93276
  */
-#if defined(HAVE_EMBEDDED) || (!defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80004) || (defined(MARIADB_PACKAGE_VERSION) && (!defined(MARIADB_PACKAGE_VERSION_ID) || MARIADB_PACKAGE_VERSION_ID < 30005)) || (defined(MARIADB_VERSION_ID) && ((MARIADB_VERSION_ID >= 100202 && MARIADB_VERSION_ID < 100219) || (MARIADB_VERSION_ID >= 100300 && MARIADB_VERSION_ID < 100309)))
+#if defined(HAVE_EMBEDDED) || (!defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80004 && MYSQL_VERSION_ID < 80015) || (defined(MARIADB_PACKAGE_VERSION) && (!defined(MARIADB_PACKAGE_VERSION_ID) || MARIADB_PACKAGE_VERSION_ID < 30005)) || (defined(MARIADB_VERSION_ID) && ((MARIADB_VERSION_ID >= 100202 && MARIADB_VERSION_ID < 100219) || (MARIADB_VERSION_ID >= 100300 && MARIADB_VERSION_ID < 100309)))
 #define HAVE_BROKEN_INIT
 #endif
 

t/56connattr.t

@@ -26,8 +26,9 @@ if ($pfenabled[1] ne 'ON') {
 }
 
 if (not eval { $dbh->do("select * from performance_schema.session_connect_attrs where processlist_id=connection_id()") }) {
+  my $err = $dbh->errstr || 'no permission on performance_schema tables';
   $dbh->disconnect();
-  plan skip_all => "no permission on performance_schema tables";
+  plan skip_all => $err;
 }
 
 $dbh->disconnect();