* Fixed debian dist file names.

* Fixed failing test results.
* Updated tztime.cc (lp:1161432).

14 files changed, 6 insertions, 1 deletions

diff --git a/debian/mariadb-server-10.0.NEWS b/debian/mariadb-galera-server-10.0.NEWS
index a3042dc2918..a3042dc2918 100644
--- a/debian/mariadb-server-10.0.NEWS
+++ b/debian/mariadb-galera-server-10.0.NEWS
diff --git a/debian/mariadb-server-10.0.config b/debian/mariadb-galera-server-10.0.config
index 162017caf71..162017caf71 100644
--- a/debian/mariadb-server-10.0.config
+++ b/debian/mariadb-galera-server-10.0.config
diff --git a/debian/mariadb-server-10.0.lintian-overrides b/debian/mariadb-galera-server-10.0.lintian-overrides
index 0b2eb6a6496..0b2eb6a6496 100644
--- a/debian/mariadb-server-10.0.lintian-overrides
+++ b/debian/mariadb-galera-server-10.0.lintian-overrides
diff --git a/debian/mariadb-server-10.0.logcheck.ignore.paranoid b/debian/mariadb-galera-server-10.0.logcheck.ignore.paranoid
index 00cc5c3e29d..00cc5c3e29d 100644
--- a/debian/mariadb-server-10.0.logcheck.ignore.paranoid
+++ b/debian/mariadb-galera-server-10.0.logcheck.ignore.paranoid
diff --git a/debian/mariadb-server-10.0.logcheck.ignore.server b/debian/mariadb-galera-server-10.0.logcheck.ignore.server
index 37f25cb01ea..37f25cb01ea 100644
--- a/debian/mariadb-server-10.0.logcheck.ignore.server
+++ b/debian/mariadb-galera-server-10.0.logcheck.ignore.server
diff --git a/debian/mariadb-server-10.0.logcheck.ignore.workstation b/debian/mariadb-galera-server-10.0.logcheck.ignore.workstation
index 37f25cb01ea..37f25cb01ea 100644
--- a/debian/mariadb-server-10.0.logcheck.ignore.workstation
+++ b/debian/mariadb-galera-server-10.0.logcheck.ignore.workstation
diff --git a/debian/mariadb-server-10.0.mysql-server.logrotate b/debian/mariadb-galera-server-10.0.mysql-server.logrotate
index 0f0de516b13..0f0de516b13 100644
--- a/debian/mariadb-server-10.0.mysql-server.logrotate
+++ b/debian/mariadb-galera-server-10.0.mysql-server.logrotate
diff --git a/debian/mariadb-server-10.0.mysql.init b/debian/mariadb-galera-server-10.0.mysql.init
index 46911aa57a1..46911aa57a1 100644
--- a/debian/mariadb-server-10.0.mysql.init
+++ b/debian/mariadb-galera-server-10.0.mysql.init
diff --git a/debian/mariadb-server-10.0.preinst b/debian/mariadb-galera-server-10.0.preinst
index 7ad46c6ee52..7ad46c6ee52 100644
--- a/debian/mariadb-server-10.0.preinst
+++ b/debian/mariadb-galera-server-10.0.preinst
diff --git a/debian/mariadb-server-10.0.prerm b/debian/mariadb-galera-server-10.0.prerm
index 03e9ea37420..03e9ea37420 100644
--- a/debian/mariadb-server-10.0.prerm
+++ b/debian/mariadb-galera-server-10.0.prerm
diff --git a/debian/mariadb-server-10.0.templates b/debian/mariadb-galera-server-10.0.templates
index 13943da534a..13943da534a 100644
--- a/debian/mariadb-server-10.0.templates
+++ b/debian/mariadb-galera-server-10.0.templates
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_10.result b/mysql-test/suite/parts/r/partition_exch_qa_10.result
index 77b91f19e8f..8afdc06fb42 100755
--- a/mysql-test/suite/parts/r/partition_exch_qa_10.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_10.result
@@ -26,6 +26,7 @@ SET @@autocommit= OFF;
 SHOW VARIABLES LIKE '%autocommit%';
 Variable_name	Value
 autocommit	OFF
+wsrep_retry_autocommit	1
 CREATE TRIGGER test_trg_1 BEFORE UPDATE ON tp FOR EACH ROW
 BEGIN
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test
index f7b31b2fffa..ae75069d103 100644
--- a/mysql-test/t/mysqld--help.test
+++ b/mysql-test/t/mysqld--help.test
@@ -20,7 +20,8 @@ perl;
   # their paths may vary:
   @skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
                log-slow-queries pid-file slow-query-log-file log-basename
-               datadir slave-load-tmpdir tmpdir socket thread-pool-size/;
+               datadir slave-load-tmpdir tmpdir socket thread-pool-size
+               wsrep-node-name/;
 
   # Plugins which may or may not be there:
   @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 2026ed425f2..b0607293296 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -2590,6 +2590,9 @@ main(int argc, char **argv)
     return 1;
   }
 
+  // Replicate MyISAM DDL for this session, cf. lp:1161432
+  printf("SET SESSION wsrep_replicate_myisam=ON;\n");
+
   if (argc == 2)
   {
     root_name_end= strmake_buf(fullname, argv[1]);