diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-10 10:04:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-10 10:04:04 +0300 |
| commit | ff5ecfd335582967d76c418514a4310f6804fdaa (patch) | |
| tree | ba03f320adb82398b30f63438e8cc3a5ece10be0 | |
| parent | da9201dd5bfbd5df68612c33e2b087705d44bec7 (diff) | |
| download | mariadb-git-ff5ecfd335582967d76c418514a4310f6804fdaa.tar.gz | |
Correct the merge 0f83c8878dc1389212c134f65d37a43d9d248250
Re-enable some Galera tests that should have been enabled.
Add client_ed25519.so to debian/libmariadb3.install;
merge e47a143fc08f7114fd877ad8ee83d322f877a672 correctly.
Remove a duplicated #include from wsrep_mysqld.cc.
| -rw-r--r-- | debian/libmariadb3.install | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 7 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/disabled.def | 1 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 1 |
4 files changed, 2 insertions, 8 deletions
diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install index 8636166a493..9783e7b0b01 100644 --- a/debian/libmariadb3.install +++ b/debian/libmariadb3.install @@ -3,3 +3,4 @@ usr/lib/mysql/plugin/client_ed25519.so usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/mysql_clear_password.so usr/lib/mysql/plugin/sha256_password.so +usr/lib/mysql/plugin/client_ed25519.so diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index f88410321ca..1e2833042fc 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -25,12 +25,7 @@ galera_gcache_recover_manytrx : MDEV-18834 Galera test failure galera_ist_mariabackup : MDEV-18829 test leaves port open galera_ist_progress : MDEV-15236 fails when trying to read transfer status galera_migrate : MariaDB does not support START SLAVE USER -galera_pc_ignore_sb : MDEV-15811/MDEV-17357 Test failure -galera_ssl_upgrade : MDEV-13549 Galera test failures -galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure -galera_var_node_address : MDEV-17151 Galera test failure -galera_var_notify_cmd : MDEV-13549 Galera test failures -galera_var_slave_threads : MDEV-19746 Galera test failures because of wsrep_slave_threads identification +galera_ssl_upgrade : MDEV-19950 Galera test failure on galera_ssl_upgrade galera_var_node_address : MDEV-20485 Galera test failure on galera.galera_var_node_address galera_wan : MDEV-17259 Test failure on galera.galera_wan partition : MDEV-19958 Galera test failure on galera.partition diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def index 27f3f9287b6..66722b0bda3 100644 --- a/mysql-test/suite/wsrep/disabled.def +++ b/mysql-test/suite/wsrep/disabled.def @@ -11,4 +11,3 @@ ############################################################################## foreign_key : Sporadic failure "WSREP has not yet prepared node for application use" -variables : MDEV-19746 Galera test failures because of wsrep_slave_threads identification diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 28a9ddb0bea..08adaac0e85 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -38,7 +38,6 @@ #include <cstdlib> #include "log_event.h" #include <slave.h> -#include "sql_plugin.h" /* wsrep_plugins_pre_init() */ wsrep_t *wsrep = NULL; /* |