diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 09:23:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 09:38:56 +0200 |
| commit | 0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d (patch) | |
| tree | 392d3fdcfe227d603fdcc96793506d4fee1867ca | |
| parent | 35184902db9291ff784742a33cb9019993dfa61c (diff) | |
| parent | 33fdb443ea79207113cf43dbd9469f7ae698b084 (diff) | |
| download | mariadb-git-0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d.tar.gz | |
Merge 10.2 into 10.3
Also, related to MDEV-15522, MDEV-17304, MDEV-17835,
remove the Galera xtrabackup tests, because xtrabackup never worked
with MariaDB Server 10.3 due to InnoDB redo log format changes.
143 files changed, 59 insertions, 2092 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index a4d6c361809..e4b81dff34c 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -44,7 +44,6 @@ The parts not included are excluded by #ifndef UNIV_INNOCHECKSUM. */ typedef void fil_space_t; -#include "univ.i" /* include all of this */ #include "page0size.h" #define FLST_BASE_NODE_SIZE (4 + 2 * FIL_ADDR_SIZE) diff --git a/extra/mariabackup/ds_local.cc b/extra/mariabackup/ds_local.cc index 1d24111b557..58353365cd6 100644 --- a/extra/mariabackup/ds_local.cc +++ b/extra/mariabackup/ds_local.cc @@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include <mysys_err.h> #include "common.h" #include "datasink.h" -#include "univ.i" #include "fsp0fsp.h" #ifdef _WIN32 #include <winioctl.h> diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index bfceb370682..5df9fa72b8f 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -48,11 +48,6 @@ galera_as_slave_replication_budle : MDEV-15785 Test case galera_as_slave_replica galera_wan : MDEV-17259: Test failure on galera.galera_wan galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb galera_drop_database : test -galera_autoinc_sst_xtrabackup : xtrabackup is deprecated -galera_ist_xtrabackup-v2 : xtrabackup is deprecated -galera_sst_xtrabackup-v2_data_dir : xtrabackup is deprecated -galera_sst_xtrabackup-v2_encrypt_with_key : xtrabackup is deprecated -galera_sst_xtrabackup-v2-options : xtrabackup is deprecated -galera_ist_innodb_flush_logs : xtrabackup is deprecated -galera_sst_xtrabackup-v2 : xtrabackup is deprecated - +galera.MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] +galera.MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] +galera.MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C] diff --git a/mysql-test/suite/galera/r/galera_autoinc_sst_xtrabackup.result b/mysql-test/suite/galera/r/galera_autoinc_sst_xtrabackup.result deleted file mode 100644 index d0fac1e3d14..00000000000 --- a/mysql-test/suite/galera/r/galera_autoinc_sst_xtrabackup.result +++ /dev/null @@ -1,47 +0,0 @@ -connection node_1; -CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB; -CREATE PROCEDURE p1 () -BEGIN -DECLARE x INT DEFAULT 1; -DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END; -WHILE 1 DO -INSERT INTO t1 VALUES (DEFAULT); -COMMIT; -END WHILE; -END| -CALL p1();; -connection node_2; -CALL p1();; -connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; -connection node_2a; -Killing server ... -INSERT INTO t1 VALUES (DEFAULT); -connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; -connection node_1a; -INSERT INTO t1 VALUES (DEFAULT); -connection node_1; -Got one of the listed errors -connection node_2; -Got one of the listed errors -connection node_1a; -connection node_2a; -count_equal -1 -CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0"); -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; -VARIABLE_VALUE -2 -SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; -VARIABLE_VALUE = 2 -1 -connection node_1a; -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; -VARIABLE_VALUE -2 -SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; -VARIABLE_VALUE = 2 -1 -DROP PROCEDURE p1; -DROP TABLE t1; -CALL mtr.add_suppression("gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)"); -CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0"); diff --git a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,debug.rdiff deleted file mode 100644 index fa1b67e7ef3..00000000000 --- a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,debug.rdiff +++ /dev/null @@ -1,103 +0,0 @@ ---- r/galera_ist_innodb_flush_logs.result 2018-09-05 10:34:36.192439933 +0300 -+++ r/galera_ist_innodb_flush_logs.reject 2018-09-17 10:20:06.039150838 +0300 -@@ -86,3 +86,100 @@ - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; -+Performing State Transfer on a server that has been killed and restarted -+while a DDL was in progress on it -+CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+COMMIT; -+SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; -+ALTER TABLE t1 ADD COLUMN f2 INTEGER; -+SET wsrep_sync_wait = 0; -+Killing server ... -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+COMMIT; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+Performing --wsrep-recover ... -+Starting server ... -+Using --wsrep-start-position when starting mysqld ... -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+COMMIT; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+COMMIT; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+COMMIT; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+ROLLBACK; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+COMMIT; -+SET AUTOCOMMIT=ON; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+DROP TABLE t1; -+COMMIT; -+SET AUTOCOMMIT=ON; -+SET GLOBAL debug_dbug = $debug_orig; diff --git a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result b/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result deleted file mode 100644 index e3bf407ddaa..00000000000 --- a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result +++ /dev/null @@ -1,88 +0,0 @@ -Performing State Transfer on a server that has been killed and restarted -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Killing server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -Performing --wsrep-recover ... -Starting server ... -Using --wsrep-start-position when starting mysqld ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; diff --git a/mysql-test/suite/galera/r/galera_ist_xtrabackup-v2,debug.rdiff b/mysql-test/suite/galera/r/galera_ist_xtrabackup-v2,debug.rdiff deleted file mode 100644 index 95310b3ffeb..00000000000 --- a/mysql-test/suite/galera/r/galera_ist_xtrabackup-v2,debug.rdiff +++ /dev/null @@ -1,103 +0,0 @@ ---- r/galera_ist_xtrabackup-v2.result 2018-09-05 10:34:36.192439933 +0300 -+++ r/galera_ist_xtrabackup-v2.reject 2018-09-17 11:13:33.395264800 +0300 -@@ -259,3 +259,100 @@ - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; -+Performing State Transfer on a server that has been killed and restarted -+while a DDL was in progress on it -+CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+COMMIT; -+SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; -+ALTER TABLE t1 ADD COLUMN f2 INTEGER; -+SET wsrep_sync_wait = 0; -+Killing server ... -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+COMMIT; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+Performing --wsrep-recover ... -+Starting server ... -+Using --wsrep-start-position when starting mysqld ... -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+COMMIT; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+COMMIT; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+COMMIT; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+ROLLBACK; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+COMMIT; -+SET AUTOCOMMIT=ON; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+DROP TABLE t1; -+COMMIT; -+SET AUTOCOMMIT=ON; -+SET GLOBAL debug_dbug = $debug_orig; diff --git a/mysql-test/suite/galera/r/galera_ist_xtrabackup-v2.result b/mysql-test/suite/galera/r/galera_ist_xtrabackup-v2.result deleted file mode 100644 index 099d944d491..00000000000 --- a/mysql-test/suite/galera/r/galera_ist_xtrabackup-v2.result +++ /dev/null @@ -1,261 +0,0 @@ -Performing State Transfer on a server that has been temporarily disconnected -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Unloading wsrep provider ... -SET GLOBAL wsrep_provider = 'none'; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -Loading wsrep provider ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; -Performing State Transfer on a server that has been shut down cleanly and restarted -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Shutting down server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -Starting server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; -Performing State Transfer on a server that has been killed and restarted -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Killing server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -Performing --wsrep-recover ... -Starting server ... -Using --wsrep-start-position when starting mysqld ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; diff --git a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2,debug.rdiff deleted file mode 100644 index 8b091eb370a..00000000000 --- a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2,debug.rdiff +++ /dev/null @@ -1,116 +0,0 @@ ---- galera_sst_mariabackup.result -+++ galera_sst_mariabackup,debug.reject -@@ -286,5 +286,113 @@ - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; -+Performing State Transfer on a server that has been killed and restarted -+while a DDL was in progress on it -+connection node_1; -+CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+connection node_2; -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+COMMIT; -+SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; -+connection node_1; -+ALTER TABLE t1 ADD COLUMN f2 INTEGER; -+connection node_2; -+SET wsrep_sync_wait = 0; -+Killing server ... -+connection node_1; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+COMMIT; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+connection node_2; -+Performing --wsrep-recover ... -+connection node_2; -+Starting server ... -+Using --wsrep-start-position when starting mysqld ... -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+COMMIT; -+connection node_1; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+COMMIT; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+COMMIT; -+connection node_1a_galera_st_kill_slave_ddl; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+ROLLBACK; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+COMMIT; -+SET AUTOCOMMIT=ON; -+connection node_1; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+DROP TABLE t1; -+COMMIT; -+SET AUTOCOMMIT=ON; -+SET GLOBAL debug_dbug = $debug_orig; - disconnect node_2; - disconnect node_1; diff --git a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2-options.result b/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2-options.result deleted file mode 100644 index 990e0a29506..00000000000 --- a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2-options.result +++ /dev/null @@ -1,3 +0,0 @@ -SELECT 1; -1 -1 diff --git a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2.result b/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2.result deleted file mode 100644 index fdb5883b590..00000000000 --- a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2.result +++ /dev/null @@ -1,290 +0,0 @@ -connection node_1; -connection node_2; -Performing State Transfer on a server that has been shut down cleanly and restarted -connection node_1; -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -connection node_2; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Shutting down server ... -connection node_1; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -connect node_1a_galera_st_shutdown_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -connection node_2; -Starting server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -connection node_1; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -connection node_1a_galera_st_shutdown_slave; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -connection node_1; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; -Performing State Transfer on a server that starts from a clean var directory -This is accomplished by shutting down node #2 and removing its var directory before restarting it -connection node_1; -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -connection node_2; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Shutting down server ... -connection node_1; -Cleaning var directory ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -connect node_1a_galera_st_clean_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -connection node_2; -Starting server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -connection node_1; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -connection node_1a_galera_st_clean_slave; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -connection node_1; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; -Performing State Transfer on a server that has been killed and restarted -connection node_1; -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -connection node_2; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Killing server ... -connection node_1; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -connect node_1a_galera_st_kill_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -connection node_2; -Performing --wsrep-recover ... -Starting server ... -Using --wsrep-start-position when starting mysqld ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -connection node_1; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -connection node_1a_galera_st_kill_slave; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -connection node_1; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; -disconnect node_2; -disconnect node_1; diff --git a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_data_dir,debug.rdiff b/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_data_dir,debug.rdiff deleted file mode 100644 index ac232020037..00000000000 --- a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_data_dir,debug.rdiff +++ /dev/null @@ -1,103 +0,0 @@ ---- r/galera_sst_xtrabackup-v2_data_dir.result 2018-11-19 12:27:24.795221479 +0200 -+++ r/galera_sst_xtrabackup-v2_data_dir.reject 2018-11-19 19:15:38.774008404 +0200 -@@ -260,3 +260,100 @@ - DROP TABLE t1; - COMMIT; - SET AUTOCOMMIT=ON; -+Performing State Transfer on a server that has been killed and restarted -+while a DDL was in progress on it -+CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+INSERT INTO t1 VALUES ('node1_committed_before'); -+START TRANSACTION; -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+INSERT INTO t1 VALUES ('node2_committed_before'); -+COMMIT; -+SET GLOBAL debug_dbug = 'd,sync.alter_opened_table'; -+ALTER TABLE t1 ADD COLUMN f2 INTEGER; -+SET wsrep_sync_wait = 0; -+Killing server ... -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_during'); -+COMMIT; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+Performing --wsrep-recover ... -+Starting server ... -+Using --wsrep-start-position when starting mysqld ... -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node2_committed_after'); -+COMMIT; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after'); -+COMMIT; -+SET AUTOCOMMIT=OFF; -+START TRANSACTION; -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+INSERT INTO t1 (f1) VALUES ('node1_committed_after'); -+COMMIT; -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after'); -+ROLLBACK; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+COMMIT; -+SET AUTOCOMMIT=ON; -+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1'; -+COUNT(*) = 2 -+1 -+SELECT COUNT(*) = 35 FROM t1; -+COUNT(*) = 35 -+1 -+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -+COUNT(*) = 0 -+1 -+DROP TABLE t1; -+COMMIT; -+SET AUTOCOMMIT=ON; -+SET GLOBAL debug_dbug = $debug_orig; diff --git a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_data_dir.result b/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_data_dir.result deleted file mode 100644 index cec0f21ee22..00000000000 --- a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_data_dir.result +++ /dev/null @@ -1,262 +0,0 @@ -Performing State Transfer on a server that has been shut down cleanly and restarted -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Shutting down server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -Starting server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; -Performing State Transfer on a server that starts from a clean var directory -This is accomplished by shutting down node #2 and removing its var directory before restarting it -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Shutting down server ... -Cleaning var directory ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -Starting server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; -Performing State Transfer on a server that has been killed and restarted -CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -INSERT INTO t1 VALUES ('node1_committed_before'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -INSERT INTO t1 VALUES ('node2_committed_before'); -COMMIT; -Killing server ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -INSERT INTO t1 VALUES ('node1_committed_during'); -COMMIT; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -Performing --wsrep-recover ... -Starting server ... -Using --wsrep-start-position when starting mysqld ... -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -INSERT INTO t1 VALUES ('node2_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -INSERT INTO t1 VALUES ('node1_to_be_committed_after'); -COMMIT; -SET AUTOCOMMIT=OFF; -START TRANSACTION; -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -INSERT INTO t1 VALUES ('node1_committed_after'); -COMMIT; -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after'); -ROLLBACK; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -COMMIT; -SET AUTOCOMMIT=ON; -SELECT COUNT(*) = 35 FROM t1; -COUNT(*) = 35 -1 -SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1; -COUNT(*) = 0 -1 -DROP TABLE t1; -COMMIT; -SET AUTOCOMMIT=ON; diff --git a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_encrypt_with_key.result b/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_encrypt_with_key.result deleted file mode 100644 index 990e0a29506..00000000000 --- a/mysql-test/suite/galera/r/galera_sst_xtrabackup-v2_encrypt_with_key.result +++ /dev/null @@ -1,3 +0,0 @@ -SELECT 1; -1 -1 diff --git a/mysql-test/suite/galera/t/galera_autoinc_sst_xtrabackup.cnf b/mysql-test/suite/galera/t/galera_autoinc_sst_xtrabackup.cnf deleted file mode 100644 index b4bf5f02171..00000000000 --- a/mysql-test/suite/galera/t/galera_autoinc_sst_xtrabackup.cnf +++ /dev/null @@ -1,12 +0,0 @@ -!include ../galera_2nodes.cnf - -[mysqld] -wsrep_sst_method=xtrabackup-v2 -wsrep_sst_auth="root:" - -[mysqld.1] -wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore_sb=true' - -[mysqld.2] -wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' - diff --git a/mysql-test/suite/galera/t/galera_autoinc_sst_xtrabackup.test b/mysql-test/suite/galera/t/galera_autoinc_sst_xtrabackup.test deleted file mode 100644 index cd7621bfa6e..00000000000 --- a/mysql-test/suite/galera/t/galera_autoinc_sst_xtrabackup.test +++ /dev/null @@ -1,96 +0,0 @@ -# -# Test that autoincrement works correctly while the cluster membership -# is changing and SST takes place. -# - ---source include/big_test.inc ---source include/galera_cluster.inc ---source include/have_innodb.inc ---source include/have_xtrabackup.inc - ---connection node_1 ---let $connection_id = `SELECT CONNECTION_ID()` - -CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB; - -# Issue an endless stream of autoincrement inserts - -DELIMITER |; -CREATE PROCEDURE p1 () -BEGIN - DECLARE x INT DEFAULT 1; - DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN END; - - WHILE 1 DO - INSERT INTO t1 VALUES (DEFAULT); - COMMIT; - END WHILE; -END| -DELIMITER ;| - ---send CALL p1(); ---sleep 2 - ---connection node_2 ---send CALL p1(); ---sleep 2 - -# Kill and restart node #2 - ---connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 ---connection node_2a ---source include/kill_galera.inc - ---sleep 10 ---source include/start_mysqld.inc ---sleep 25 ---source include/wait_until_connected_again.inc - -INSERT INTO t1 VALUES (DEFAULT); - -# Terminate the stored procedure - ---connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1 ---connection node_1a ---disable_query_log ---eval KILL CONNECTION $connection_id ---enable_query_log - -INSERT INTO t1 VALUES (DEFAULT); - ---connection node_1 -# CR_SERVER_LOST ---error 2013,2006 ---reap - ---connection node_2 -# CR_SERVER_LOST ---error 2013,2006 ---reap - ---sleep 10 - -# Confirm that the count is correct and that the cluster is intact - ---connection node_1a ---let $count = `SELECT COUNT(*) FROM t1` - ---connection node_2a ---disable_query_log ---eval SELECT COUNT(*) = $count AS count_equal FROM t1 ---enable_query_log - -CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0"); - -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; -SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; - ---connection node_1a -SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; -SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; - -DROP PROCEDURE p1; -DROP TABLE t1; - -CALL mtr.add_suppression("gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)"); -CALL mtr.add_suppression("WSREP: Action message in non-primary configuration from member 0"); diff --git a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf b/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf deleted file mode 100644 index 41a1aab382b..00000000000 --- a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf +++ /dev/null @@ -1,14 +0,0 @@ -!include ../galera_2nodes.cnf - -[mysqld] -wsrep_sst_method=xtrabackup-v2 -wsrep_sst_auth=root: - -innodb_flush_log_at_trx_commit=0 - -[mysqld.1] -wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true' - -[mysqld.2] -wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true' - diff --git a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test b/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test deleted file mode 100644 index 07838702deb..00000000000 --- a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test +++ /dev/null @@ -1,12 +0,0 @@ -# -# This test performs server kill and IST while innodb_flush_logs_on_trx_commit = 0 -# This confirms that IST can properly catch up even in the face of relaxed single-node durability -# -# - ---source include/big_test.inc ---source include/galera_cluster.inc ---source include/have_innodb.inc - ---source suite/galera/include/galera_st_kill_slave.inc ---source suite/galera/include/galera_st_kill_slave_ddl.inc diff --git a/mysql-test/suite/galera/t/galera_ist_xtrabackup-v2.cnf b/mysql-test/suite/galera/t/galera_ist_xtrabackup-v2.cnf deleted file mode 100644 index a762b939f69..00000000000 --- a/mysql-test/suite/galera/t/galera_ist_xtrabackup-v2.cnf +++ /dev/null @@ -1,12 +0,0 @@ -!include ../galera_2nodes.cnf - -[mysqld] -wsrep_sst_method=xtrabackup-v2 -wsrep_sst_auth=root: - -[mysqld.1] -wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true' - -[mysqld.2] -wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true' - diff --git a/mysql-test/suite/galera/t/galera_ist_xtrabackup-v2.test b/mysql-test/suite/galera/t/galera_ist_xtrabackup-v2.test deleted file mode 100644 index 34961765008..00000000000 --- a/mysql-test/suite/galera/t/galera_ist_xtrabackup-v2.test +++ /dev/null @@ -1,15 +0,0 @@ ---source include/big_test.inc ---source include/galera_cluster.inc ---source include/have_innodb.inc ---source include/have_xtrabackup.inc - ---let $node_1=node_1 ---let $node_2=node_2 ---source include/auto_increment_offset_save.inc - ---source suite/galera/include/galera_st_disconnect_slave.inc ---source suite/galera/include/galera_st_shutdown_slave.inc - ---source suite/galera/include/galera_st_kill_slave.inc ---source suite/galera/include/galera_st_kill_slave_ddl.inc ---source include/auto_increment_offset_restore.inc diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2-options.cnf b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2-options.cnf deleted file mode 100644 index 3abf2549aae..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2-options.cnf +++ /dev/null @@ -1,25 +0,0 @@ -!include ../galera_2nodes.cnf - -[mysqld] -wsrep_sst_method=xtrabackup-v2 -wsrep_sst_auth="root:" -wsrep_debug=ON - -[xtrabackup] -backup-locks -close-files -#compact - disabled in xtrabackup 2.4, https://bugs.launchpad.net/percona-xtrabackup/+bug/1192834/comments/29 -# compression requires qpress from the Percona repositories -# compress -# compress-threads=2 -encryption=AES256 -encrypt-key=4FA92C5873672E20FB163A0BCB2BB4A4 -galera-info -history=backup -parallel=2 - -[SST] -encrypt=1 -encrypt-algo=AES256 -encrypt-key=4FA92C5873672E20FB163A0BCB2BB4A4 -transferfmt=@ENV.MTR_GALERA_TFMT diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2-options.test b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2-options.test deleted file mode 100644 index db2b706b6b8..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2-options.test +++ /dev/null @@ -1,13 +0,0 @@ -# -# This test checks that various options can be passed to xtrabackup via the my.cnf file -# Initial SST happens via xtrabackup, so there is not much to do in the body of the test -# - ---source include/galera_cluster.inc ---source include/have_innodb.inc ---source include/have_xtrabackup.inc - -SELECT 1; - ---let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; ---source include/wait_condition.inc diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2.cnf b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2.cnf deleted file mode 100644 index 0025b259ec5..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2.cnf +++ /dev/null @@ -1,15 +0,0 @@ -!include ../galera_2nodes.cnf - -[mysqld] -wsrep_sst_method=xtrabackup-v2 -wsrep_sst_auth="root:" -wsrep_debug=ON - -[mysqld.1] -wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore_sb=true' - -[mysqld.2] -wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' - -[sst] -transferfmt=@ENV.MTR_GALERA_TFMT diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2.test b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2.test deleted file mode 100644 index c270e4d0b19..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2.test +++ /dev/null @@ -1,20 +0,0 @@ ---source include/big_test.inc ---source include/galera_cluster.inc ---source include/have_innodb.inc ---source include/have_xtrabackup.inc - -# Save original auto_increment_offset values. ---let $node_1=node_1 ---let $node_2=node_2 ---source include/auto_increment_offset_save.inc - ---source suite/galera/include/galera_st_shutdown_slave.inc ---source suite/galera/include/galera_st_clean_slave.inc - ---source suite/galera/include/galera_st_kill_slave.inc ---source suite/galera/include/galera_st_kill_slave_ddl.inc - -# Restore original auto_increment_offset values. ---source include/auto_increment_offset_restore.inc - ---source include/galera_end.inc diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_data_dir.cnf b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_data_dir.cnf deleted file mode 100644 index 89f23d24d87..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_data_dir.cnf +++ /dev/null @@ -1,16 +0,0 @@ -!include ../galera_2nodes.cnf - -[mysqld] -wsrep_sst_method=xtrabackup-v2 -wsrep_sst_auth="root:" -wsrep_debug=ON - -[mysqld.1] -wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=1;pc.ignore_sb=true' - -[mysqld.2] -innodb_data_home_dir=@ENV.MYSQL_TMP_DIR/rsync_test_2 -wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' - -[sst] -transferfmt=@ENV.MTR_GALERA_TFMT diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_data_dir.test b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_data_dir.test deleted file mode 100644 index 135bc2a39f7..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_data_dir.test +++ /dev/null @@ -1,23 +0,0 @@ ---source include/big_test.inc ---source include/galera_cluster.inc ---source include/have_innodb.inc ---source include/have_xtrabackup.inc - -# Save original auto_increment_offset values. ---let $node_1=node_1 ---let $node_2=node_2 ---source include/auto_increment_offset_save.inc - ---source suite/galera/include/galera_st_shutdown_slave.inc ---source suite/galera/include/galera_st_clean_slave.inc - ---source suite/galera/include/galera_st_kill_slave.inc ---source suite/galera/include/galera_st_kill_slave_ddl.inc - -# Restore original auto_increment_offset values. ---source include/auto_increment_offset_restore.inc - ---source include/galera_end.inc - -# cleanup temporary database files: ---remove_files_wildcard $MYSQL_TMP_DIR/rsync_test_2 * diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_encrypt_with_key.cnf b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_encrypt_with_key.cnf deleted file mode 100644 index 63d05104a37..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_encrypt_with_key.cnf +++ /dev/null @@ -1,12 +0,0 @@ -!include ../galera_2nodes.cnf - -[mysqld] -wsrep_sst_method=xtrabackup-v2 -wsrep_sst_auth="root:" -wsrep_debug=ON - -[SST] -tkey=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem -tcert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem -encrypt=3 -transferfmt=@ENV.MTR_GALERA_TFMT diff --git a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_encrypt_with_key.test b/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_encrypt_with_key.test deleted file mode 100644 index 2f685ca7184..00000000000 --- a/mysql-test/suite/galera/t/galera_sst_xtrabackup-v2_encrypt_with_key.test +++ /dev/null @@ -1,14 +0,0 @@ -# -# This test checks that key and cert encryption options can be passed to xtrabackup via the my.cnf file -# Initial SST happens via xtrabackup, so there is not much to do in the body of the test -# - ---source include/big_test.inc ---source include/galera_cluster.inc ---source include/have_innodb.inc ---source include/have_xtrabackup.inc - -SELECT 1; - ---let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; ---source include/wait_condition.inc diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 82c2dfb3eb2..dd9dca496fb 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -31,7 +31,6 @@ The database buffer buf_pool Created 11/5/1995 Heikki Tuuri *******************************************************/ -#include "univ.i" #include "mtr0types.h" #include "mach0data.h" #include "page0size.h" diff --git a/storage/innobase/buf/buf0checksum.cc b/storage/innobase/buf/buf0checksum.cc index 732a58ed85a..74b182affbf 100644 --- a/storage/innobase/buf/buf0checksum.cc +++ b/storage/innobase/buf/buf0checksum.cc @@ -24,18 +24,15 @@ Buffer pool checksum functions, also linked from /extra/innochecksum.cc Created Aug 11, 2011 Vasil Dimov *******************************************************/ -#include "univ.i" +#include "buf0checksum.h" #include "fil0fil.h" #include "ut0crc32.h" #include "ut0rnd.h" -#include "buf0checksum.h" #ifndef UNIV_INNOCHECKSUM #include "srv0srv.h" #endif /* !UNIV_INNOCHECKSUM */ -#include "buf0types.h" - /** the macro MYSQL_SYSVAR_ENUM() requires "long unsigned int" and if we use srv_checksum_algorithm_t here then we get a compiler error: ha_innodb.cc:12251: error: cannot convert 'srv_checksum_algorithm_t*' to diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc index 088741e8ce8..c8e7236dc93 100644 --- a/storage/innobase/buf/buf0dump.cc +++ b/storage/innobase/buf/buf0dump.cc @@ -30,8 +30,6 @@ Created April 08, 2011 Vasil Dimov #include "mysql/psi/mysql_stage.h" #include "mysql/psi/psi.h" -#include "univ.i" - #include "buf0buf.h" #include "buf0dump.h" #include "dict0dict.h" diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc index c696407a694..25a90342f78 100644 --- a/storage/innobase/dict/dict0crea.cc +++ b/storage/innobase/dict/dict0crea.cc @@ -2150,15 +2150,6 @@ dict_create_add_foreigns_to_dictionary( } } - trx->op_info = "committing foreign key definitions"; - - if (trx_is_started(trx)) { - - trx_commit(trx); - } - - trx->op_info = ""; - return(DB_SUCCESS); } diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc index 20ebbc136c6..f236d2edadf 100644 --- a/storage/innobase/dict/dict0stats.cc +++ b/storage/innobase/dict/dict0stats.cc @@ -24,14 +24,13 @@ Code used for calculating and manipulating table statistics. Created Jan 06, 2010 Vasil Dimov *******************************************************/ -#include "univ.i" +#include "dict0stats.h" #include "ut0ut.h" #include "ut0rnd.h" #include "dyn0buf.h" #include "row0sel.h" #include "trx0trx.h" #include "pars0pars.h" -#include "dict0stats.h" #include <mysql_com.h> #include "btr0btr.h" diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 9247313b392..0c2ee5203cf 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -31,13 +31,13 @@ Created 10/25/1995 Heikki Tuuri #include "buf0buf.h" #include "dict0boot.h" #include "dict0dict.h" +#include "dict0load.h" #include "fsp0file.h" #include "fsp0fsp.h" #include "hash0hash.h" #include "log0log.h" #include "log0recv.h" #include "mach0data.h" -#include "mem0mem.h" #include "mtr0log.h" #include "os0file.h" #include "page0zip.h" diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 7d555bfec51..a747038aed4 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -71,6 +71,7 @@ this program; if not, write to the Free Software Foundation, Inc., #include "buf0flu.h" #include "buf0lru.h" #include "dict0boot.h" +#include "dict0load.h" #include "btr0defragment.h" #include "dict0crea.h" #include "dict0dict.h" @@ -85,10 +86,8 @@ this program; if not, write to the Free Software Foundation, Inc., #include "ibuf0ibuf.h" #include "lock0lock.h" #include "log0crypt.h" -#include "mem0mem.h" #include "mtr0mtr.h" #include "os0file.h" -#include "os0thread.h" #include "page0zip.h" #include "pars0pars.h" #include "rem0types.h" @@ -12265,8 +12264,6 @@ int create_table_info_t::create_table(bool create_fk) int error; int primary_key_no; uint i; - const char* stmt; - size_t stmt_len; DBUG_ENTER("create_table"); @@ -12345,9 +12342,7 @@ int create_table_info_t::create_table(bool create_fk) my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), FTS_DOC_ID_INDEX_NAME); - m_drop_before_rollback = false; - error = -1; - DBUG_RETURN(error); + DBUG_RETURN(-1); case FTS_EXIST_DOC_ID_INDEX: case FTS_NOT_EXIST_DOC_ID_INDEX: break; @@ -12381,15 +12376,28 @@ int create_table_info_t::create_table(bool create_fk) dict_table_get_all_fts_indexes(m_table, fts->indexes); } - stmt = innobase_get_stmt_unsafe(m_thd, &stmt_len); - - if (stmt) { - dberr_t err = row_table_add_foreign_constraints( - create_fk ? m_trx : NULL, stmt, stmt_len, m_table_name, - m_create_info->options & HA_LEX_CREATE_TMP_TABLE); + size_t stmt_len; + if (const char* stmt = innobase_get_stmt_unsafe(m_thd, &stmt_len)) { + dberr_t err = create_fk + ? dict_create_foreign_constraints( + m_trx, stmt, stmt_len, m_table_name, + m_flags2 & DICT_TF2_TEMPORARY) + : DB_SUCCESS; + if (err == DB_SUCCESS) { + /* Check that also referencing constraints are ok */ + dict_names_t fk_tables; + err = dict_load_foreigns(m_table_name, NULL, + false, true, + DICT_ERR_IGNORE_NONE, + fk_tables); + while (err == DB_SUCCESS && !fk_tables.empty()) { + dict_load_table(fk_tables.front(), true, + DICT_ERR_IGNORE_NONE); + fk_tables.pop_front(); + } + } switch (err) { - case DB_PARENT_NO_INDEX: push_warning_printf( m_thd, Sql_condition::WARN_LEVEL_WARN, @@ -12422,13 +12430,9 @@ int create_table_info_t::create_table(bool create_fk) break; } - error = convert_error_code_to_mysql(err, m_flags, NULL); - - if (error) { - /* row_table_add_foreign_constraints() dropped - the table */ - m_drop_before_rollback = false; - DBUG_RETURN(error); + if (err != DB_SUCCESS) { + DBUG_RETURN(convert_error_code_to_mysql( + err, m_flags, NULL)); } } diff --git a/storage/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h index 398b009f061..b99e7e4c522 100644 --- a/storage/innobase/include/btr0btr.h +++ b/storage/innobase/include/btr0btr.h @@ -28,12 +28,9 @@ Created 6/2/1994 Heikki Tuuri #ifndef btr0btr_h #define btr0btr_h -#include "univ.i" - #include "dict0dict.h" #include "data0data.h" #include "page0cur.h" -#include "mtr0mtr.h" #include "btr0types.h" #include "gis0type.h" diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h index f8afa03ce3f..358f394c5b4 100644 --- a/storage/innobase/include/btr0cur.h +++ b/storage/innobase/include/btr0cur.h @@ -27,12 +27,11 @@ Created 10/16/1994 Heikki Tuuri #ifndef btr0cur_h #define btr0cur_h -#include "univ.i" -#include "my_base.h" #include "dict0dict.h" #include "page0cur.h" #include "btr0types.h" #include "gis0type.h" +#include "my_base.h" /** Mode flags for btr_cur operations; these can be ORed */ enum { diff --git a/storage/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h index 747ad676e33..b69d07811f3 100644 --- a/storage/innobase/include/btr0pcur.h +++ b/storage/innobase/include/btr0pcur.h @@ -27,14 +27,9 @@ Created 2/23/1996 Heikki Tuuri #ifndef btr0pcur_h #define btr0pcur_h -#include "univ.i" #include "dict0dict.h" -#include "data0data.h" -#include "mtr0mtr.h" -#include "page0cur.h" #include "btr0cur.h" #include "btr0btr.h" -#include "btr0types.h" #include "gis0rtree.h" /* Relative positions for a stored cursor position */ diff --git a/storage/innobase/include/btr0scrub.h b/storage/innobase/include/btr0scrub.h index 8029cc91005..feaf61784d0 100644 --- a/storage/innobase/include/btr0scrub.h +++ b/storage/innobase/include/btr0scrub.h @@ -3,13 +3,7 @@ #ifndef btr0scrub_h #define btr0scrub_h -#include "univ.i" - #include "dict0dict.h" -#include "data0data.h" -#include "page0cur.h" -#include "mtr0mtr.h" -#include "btr0types.h" /** * enum describing page allocation status diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h index f0174a2610c..0c8b152d413 100644 --- a/storage/innobase/include/btr0sea.h +++ b/storage/innobase/include/btr0sea.h @@ -27,12 +27,7 @@ Created 2/17/1996 Heikki Tuuri #ifndef btr0sea_h #define btr0sea_h -#include "univ.i" - -#include "rem0rec.h" #include "dict0dict.h" -#include "btr0types.h" -#include "mtr0mtr.h" #ifdef BTR_CUR_HASH_ADAPT #include "ha0ha.h" diff --git a/storage/innobase/include/btr0types.h b/storage/innobase/include/btr0types.h index 77d1b286fbb..f8685d34764 100644 --- a/storage/innobase/include/btr0types.h +++ b/storage/innobase/include/btr0types.h @@ -26,12 +26,9 @@ Created 2/17/1996 Heikki Tuuri #ifndef btr0types_h #define btr0types_h -#include "univ.i" - -#include "rem0types.h" #include "page0types.h" -#include "sync0rw.h" #include "page0size.h" +#include "rem0types.h" /** Persistent cursor */ struct btr_pcur_t; diff --git a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h index 8befc038f23..7ee837d6d2e 100644 --- a/storage/innobase/include/buf0buddy.h +++ b/storage/innobase/include/buf0buddy.h @@ -31,7 +31,6 @@ Created December 2006 by Marko Makela # define UNIV_INLINE #endif -#include "univ.i" #include "buf0types.h" /**********************************************************************//** diff --git a/storage/innobase/include/buf0checksum.h b/storage/innobase/include/buf0checksum.h index dc0dbafa4c4..98c6ff16a6a 100644 --- a/storage/innobase/include/buf0checksum.h +++ b/storage/innobase/include/buf0checksum.h @@ -27,8 +27,6 @@ Created Aug 11, 2011 Vasil Dimov #ifndef buf0checksum_h #define buf0checksum_h -#include "univ.i" - #include "buf0types.h" /** Calculate the CRC32 checksum of a page. The value is stored to the page diff --git a/storage/innobase/include/buf0dblwr.h b/storage/innobase/include/buf0dblwr.h index 5d2e5e9fdf7..0f0cc53ba1b 100644 --- a/storage/innobase/include/buf0dblwr.h +++ b/storage/innobase/include/buf0dblwr.h @@ -27,7 +27,6 @@ Created 2011/12/19 Inaam Rana #ifndef buf0dblwr_h #define buf0dblwr_h -#include "univ.i" #include "ut0byte.h" #include "log0log.h" #include "buf0types.h" diff --git a/storage/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h index 741cb1dbca3..6ee84e99d5b 100644 --- a/storage/innobase/include/buf0flu.h +++ b/storage/innobase/include/buf0flu.h @@ -27,7 +27,6 @@ Created 11/5/1995 Heikki Tuuri #ifndef buf0flu_h #define buf0flu_h -#include "univ.i" #include "ut0byte.h" #include "log0log.h" #include "buf0types.h" diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h index d3e953ad9c7..81a257b0371 100644 --- a/storage/innobase/include/buf0lru.h +++ b/storage/innobase/include/buf0lru.h @@ -27,7 +27,6 @@ Created 11/5/1995 Heikki Tuuri #ifndef buf0lru_h #define buf0lru_h -#include "univ.i" #include "ut0byte.h" #include "buf0types.h" diff --git a/storage/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h index a7c43e01467..c32b0d3637e 100644 --- a/storage/innobase/include/buf0rea.h +++ b/storage/innobase/include/buf0rea.h @@ -27,9 +27,7 @@ Created 11/5/1995 Heikki Tuuri #ifndef buf0rea_h #define buf0rea_h -#include "univ.i" #include "buf0buf.h" -#include "buf0types.h" /** High-level function which reads a page asynchronously from a file to the buffer buf_pool if it is not already there. Sets the io_fix flag and sets diff --git a/storage/innobase/include/data0data.h b/storage/innobase/include/data0data.h index 0fa4cbe8777..15c7ac9866a 100644 --- a/storage/innobase/include/data0data.h +++ b/storage/innobase/include/data0data.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -27,8 +27,6 @@ Created 5/30/1994 Heikki Tuuri #ifndef data0data_h #define data0data_h -#include "univ.i" - #include "data0types.h" #include "data0type.h" #include "mem0mem.h" diff --git a/storage/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h index 25aced44b2e..d683afcdc7e 100644 --- a/storage/innobase/include/dict0boot.h +++ b/storage/innobase/include/dict0boot.h @@ -26,13 +26,10 @@ Created 4/18/1996 Heikki Tuuri #ifndef dict0boot_h #define dict0boot_h -#include "univ.i" - #include "mtr0mtr.h" #include "mtr0log.h" #include "ut0byte.h" #include "buf0buf.h" -#include "fsp0fsp.h" #include "dict0dict.h" typedef byte dict_hdr_t; diff --git a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h index 7106d1ba85e..75ef4f09dbb 100644 --- a/storage/innobase/include/dict0crea.h +++ b/storage/innobase/include/dict0crea.h @@ -27,8 +27,6 @@ Created 1/8/1996 Heikki Tuuri #ifndef dict0crea_h #define dict0crea_h -#include "univ.i" -#include "dict0types.h" #include "dict0dict.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/dict0defrag_bg.h b/storage/innobase/include/dict0defrag_bg.h index ddef139853c..fe75c6a21d1 100644 --- a/storage/innobase/include/dict0defrag_bg.h +++ b/storage/innobase/include/dict0defrag_bg.h @@ -27,12 +27,9 @@ Created 25/08/2016 Jan Lindström #ifndef dict0defrag_bg_h #define dict0defrag_bg_h -#include "univ.i" - -#include "dict0types.h" #include "os0event.h" #include "os0thread.h" - +#include "dict0types.h" /** Indices whose defrag stats need to be saved to persistent storage.*/ struct defrag_pool_item_t { diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index c5381d6fc12..bf9fcd70f18 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -28,22 +28,10 @@ Created 1/8/1996 Heikki Tuuri #ifndef dict0dict_h #define dict0dict_h -#include "univ.i" #include "data0data.h" -#include "data0type.h" #include "dict0mem.h" -#include "dict0types.h" #include "fsp0fsp.h" -#include "hash0hash.h" -#include "mem0mem.h" -#include "rem0types.h" -#include "row0types.h" -#include "trx0types.h" -#include "ut0byte.h" -#include "ut0mem.h" -#include "ut0rnd.h" #include <deque> -#include "fsp0fsp.h" #include "dict0pagecompress.h" extern bool innodb_table_stats_not_found; diff --git a/storage/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic index 3bcd1abfbbf..03b842e041d 100644 --- a/storage/innobase/include/dict0dict.ic +++ b/storage/innobase/include/dict0dict.ic @@ -24,12 +24,6 @@ Data dictionary system Created 1/8/1996 Heikki Tuuri ***********************************************************************/ -#include "data0type.h" -#include "dict0load.h" -#include "rem0types.h" -#include "fsp0fsp.h" -#include "srv0srv.h" -#include "sync0rw.h" #include "fsp0sysspace.h" /*********************************************************************//** diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index 3adb1f9ddef..63cf5c8bbec 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -28,8 +28,6 @@ Created 1/8/1996 Heikki Tuuri #ifndef dict0mem_h #define dict0mem_h -#include "univ.i" -#include "dict0types.h" #include "data0type.h" #include "mem0mem.h" #include "row0types.h" diff --git a/storage/innobase/include/dict0priv.h b/storage/innobase/include/dict0priv.h index 593c27125a2..b216a16c181 100644 --- a/storage/innobase/include/dict0priv.h +++ b/storage/innobase/include/dict0priv.h @@ -26,8 +26,6 @@ Created Fri 2 Jul 2010 13:30:38 EST - Sunny Bains #ifndef dict0priv_h #define dict0priv_h -#include "univ.i" - /**********************************************************************//** Gets a table; loads it to the dictionary cache if necessary. A low-level function. Note: Not to be called from outside dict0*c functions. diff --git a/storage/innobase/include/dict0stats.h b/storage/innobase/include/dict0stats.h index 407e0221110..95507dca36c 100644 --- a/storage/innobase/include/dict0stats.h +++ b/storage/innobase/include/dict0stats.h @@ -27,8 +27,6 @@ Created Jan 06, 2010 Vasil Dimov #ifndef dict0stats_h #define dict0stats_h -#include "univ.i" - #include "dict0types.h" #include "trx0types.h" diff --git a/storage/innobase/include/dict0stats.ic b/storage/innobase/include/dict0stats.ic index 0d187ed90c7..4edc7860363 100644 --- a/storage/innobase/include/dict0stats.ic +++ b/storage/innobase/include/dict0stats.ic @@ -25,7 +25,6 @@ Created Jan 23, 2012 Vasil Dimov *******************************************************/ #include "dict0dict.h" -#include "dict0types.h" #include "srv0srv.h" /*********************************************************************//** diff --git a/storage/innobase/include/dict0stats_bg.h b/storage/innobase/include/dict0stats_bg.h index d66afdd4b25..8387e3265b2 100644 --- a/storage/innobase/include/dict0stats_bg.h +++ b/storage/innobase/include/dict0stats_bg.h @@ -27,8 +27,6 @@ Created Apr 26, 2012 Vasil Dimov #ifndef dict0stats_bg_h #define dict0stats_bg_h -#include "univ.i" - #include "dict0types.h" #include "os0event.h" #include "os0thread.h" diff --git a/storage/innobase/include/dyn0buf.h b/storage/innobase/include/dyn0buf.h index 4b6c808b47c..0954851bca4 100644 --- a/storage/innobase/include/dyn0buf.h +++ b/storage/innobase/include/dyn0buf.h @@ -27,10 +27,9 @@ Created 2013-03-16 Sunny Bains #ifndef dyn0buf_h #define dyn0buf_h -#include "univ.i" -#include "ut0lst.h" #include "mem0mem.h" #include "dyn0types.h" +#include "ut0lst.h" /** Class that manages dynamic buffers. It uses a UT_LIST of mtr_buf_t::block_t instances. We don't use STL containers in diff --git a/storage/innobase/include/eval0eval.h b/storage/innobase/include/eval0eval.h index 2e20c634c3b..348d71af8f4 100644 --- a/storage/innobase/include/eval0eval.h +++ b/storage/innobase/include/eval0eval.h @@ -27,7 +27,6 @@ Created 12/29/1997 Heikki Tuuri #ifndef eval0eval_h #define eval0eval_h -#include "univ.i" #include "que0types.h" #include "pars0sym.h" #include "pars0pars.h" diff --git a/storage/innobase/include/eval0proc.h b/storage/innobase/include/eval0proc.h index b359bf06ce0..4bab9b7bc34 100644 --- a/storage/innobase/include/eval0proc.h +++ b/storage/innobase/include/eval0proc.h @@ -26,7 +26,6 @@ Created 1/20/1998 Heikki Tuuri #ifndef eval0proc_h #define eval0proc_h -#include "univ.i" #include "que0types.h" #include "pars0sym.h" #include "pars0pars.h" diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 3cae36d3eeb..91f50d70e5d 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -26,14 +26,12 @@ Created 10/25/1995 Heikki Tuuri #ifndef fil0fil_h #define fil0fil_h -#include "univ.i" #ifndef UNIV_INNOCHECKSUM #include "log0recv.h" #include "dict0types.h" #include "page0size.h" -#include "ibuf0types.h" // Forward declaration extern my_bool srv_use_doublewrite_buf; @@ -372,6 +370,8 @@ of the address is FIL_NULL, the address is considered undefined. */ typedef byte fil_faddr_t; /*!< 'type' definition in C: an address stored in a file page is a string of bytes */ +#else +# include "univ.i" #endif /* !UNIV_INNOCHECKSUM */ /** Initial size of a single-table tablespace in pages */ @@ -538,6 +538,8 @@ enum fil_encryption_t { FIL_ENCRYPTION_OFF }; +#ifndef UNIV_INNOCHECKSUM + /** The number of fsyncs done to the log */ extern ulint fil_n_log_flushes; @@ -546,8 +548,6 @@ extern ulint fil_n_pending_log_flushes; /** Number of pending tablespace flushes */ extern ulint fil_n_pending_tablespace_flushes; -#ifndef UNIV_INNOCHECKSUM - /** Look up a tablespace. The caller should hold an InnoDB table lock or a MDL that prevents the tablespace from being dropped during the operation, diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index 79098b71375..76c7762fac3 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -27,8 +27,6 @@ Created 12/18/1995 Heikki Tuuri #ifndef fsp0fsp_h #define fsp0fsp_h -#include "univ.i" - #include "fsp0types.h" #ifndef UNIV_INNOCHECKSUM @@ -40,7 +38,6 @@ Created 12/18/1995 Heikki Tuuri #include "ut0byte.h" #endif /* !UNIV_INNOCHECKSUM */ -#include "fsp0types.h" /** @return the PAGE_SSIZE flags for the current innodb_page_size */ #define FSP_FLAGS_PAGE_SSIZE() \ diff --git a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h index f7a5befa6ae..642bd20e67e 100644 --- a/storage/innobase/include/fsp0types.h +++ b/storage/innobase/include/fsp0types.h @@ -27,6 +27,8 @@ Created May 26, 2009 Vasil Dimov #ifndef fsp0types_h #define fsp0types_h +#include "univ.i" + #ifndef UNIV_INNOCHECKSUM /** The fil_space_t::id of the redo log. All persistent tablespaces @@ -35,7 +37,6 @@ have a smaller fil_space_t::id. */ /** The fil_space_t::id of the innodb_temporary tablespace. */ #define SRV_TMP_SPACE_ID 0xFFFFFFFEU -#include "univ.i" #include "ut0byte.h" /** @name Flags for inserting records in order diff --git a/storage/innobase/include/fts0fts.h b/storage/innobase/include/fts0fts.h index ceef1923258..4c4647dba95 100644 --- a/storage/innobase/include/fts0fts.h +++ b/storage/innobase/include/fts0fts.h @@ -29,8 +29,6 @@ Created 2011/09/02 Sunny Bains #include "data0type.h" #include "data0types.h" -#include "dict0types.h" -#include "hash0hash.h" #include "mem0mem.h" #include "rem0types.h" #include "row0types.h" diff --git a/storage/innobase/include/fts0priv.h b/storage/innobase/include/fts0priv.h index d045c9d3c72..85331cbd31e 100644 --- a/storage/innobase/include/fts0priv.h +++ b/storage/innobase/include/fts0priv.h @@ -27,7 +27,6 @@ Created 2011/09/02 Sunny Bains #ifndef INNOBASE_FTS0PRIV_H #define INNOBASE_FTS0PRIV_H -#include "univ.i" #include "dict0dict.h" #include "pars0pars.h" #include "que0que.h" diff --git a/storage/innobase/include/fts0types.h b/storage/innobase/include/fts0types.h index 0bcb8d5a1d3..88d2d2bd0f2 100644 --- a/storage/innobase/include/fts0types.h +++ b/storage/innobase/include/fts0types.h @@ -27,7 +27,6 @@ Created 2007-03-27 Sunny Bains #ifndef INNOBASE_FTS0TYPES_H #define INNOBASE_FTS0TYPES_H -#include "univ.i" #include "fts0fts.h" #include "fut0fut.h" #include "pars0pars.h" diff --git a/storage/innobase/include/fut0fut.h b/storage/innobase/include/fut0fut.h index 82882444291..497b6ac5114 100644 --- a/storage/innobase/include/fut0fut.h +++ b/storage/innobase/include/fut0fut.h @@ -27,8 +27,6 @@ Created 12/13/1995 Heikki Tuuri #ifndef fut0fut_h #define fut0fut_h -#include "univ.i" - #include "fil0fil.h" #include "mtr0mtr.h" diff --git a/storage/innobase/include/fut0lst.h b/storage/innobase/include/fut0lst.h index bff4a92f381..092889fc42c 100644 --- a/storage/innobase/include/fut0lst.h +++ b/storage/innobase/include/fut0lst.h @@ -28,8 +28,6 @@ Created 11/28/1995 Heikki Tuuri #ifndef UNIV_INNOCHECKSUM -#include "univ.i" - #include "fil0fil.h" #include "mtr0mtr.h" diff --git a/storage/innobase/include/gis0rtree.h b/storage/innobase/include/gis0rtree.h index 461d2816653..7bfee9b06e5 100644 --- a/storage/innobase/include/gis0rtree.h +++ b/storage/innobase/include/gis0rtree.h @@ -27,24 +27,6 @@ Created 2013/03/27 Jimmy Yang and Allen Lai #ifndef gis0rtree_h #define gis0rtree_h -#include "univ.i" -#include "my_base.h" - -#include "data0type.h" -#include "data0types.h" -#include "dict0types.h" -#include "hash0hash.h" -#include "mem0mem.h" -#include "page0page.h" -#include "rem0types.h" -#include "row0types.h" -#include "trx0types.h" -#include "ut0vec.h" -#include "ut0wqueue.h" -#include "que0types.h" -#include "gis0geo.h" -#include "gis0type.h" -#include "btr0types.h" #include "btr0cur.h" /* Whether MBR 'a' contains 'b' */ diff --git a/storage/innobase/include/gis0type.h b/storage/innobase/include/gis0type.h index 887b06f3613..52add38b811 100644 --- a/storage/innobase/include/gis0type.h +++ b/storage/innobase/include/gis0type.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -30,14 +31,7 @@ Created 2013/03/27 Jimmy Yang #include "data0type.h" #include "data0types.h" #include "dict0types.h" -#include "hash0hash.h" -#include "mem0mem.h" -#include "rem0types.h" -#include "row0types.h" -#include "trx0types.h" #include "ut0vec.h" -#include "ut0wqueue.h" -#include "que0types.h" #include "gis0geo.h" #include <vector> diff --git a/storage/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h index f5be654f490..060d36b2de1 100644 --- a/storage/innobase/include/ha0ha.h +++ b/storage/innobase/include/ha0ha.h @@ -27,8 +27,6 @@ Created 8/18/1994 Heikki Tuuri #ifndef ha0ha_h #define ha0ha_h -#include "univ.i" - #include "hash0hash.h" #include "page0types.h" #include "buf0types.h" diff --git a/storage/innobase/include/ha0storage.ic b/storage/innobase/include/ha0storage.ic index e841925d320..ebd788deda8 100644 --- a/storage/innobase/include/ha0storage.ic +++ b/storage/innobase/include/ha0storage.ic @@ -25,8 +25,6 @@ its own storage, avoiding duplicates. Created September 24, 2007 Vasil Dimov *******************************************************/ -#include "univ.i" -#include "ha0storage.h" #include "hash0hash.h" #include "mem0mem.h" diff --git a/storage/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h index cbb6da488b5..6afdf337aff 100644 --- a/storage/innobase/include/hash0hash.h +++ b/storage/innobase/include/hash0hash.h @@ -27,7 +27,6 @@ Created 5/20/1997 Heikki Tuuri #ifndef hash0hash_h #define hash0hash_h -#include "univ.i" #include "mem0mem.h" #include "sync0rw.h" diff --git a/storage/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h index 95a302b1439..72b9e291fca 100644 --- a/storage/innobase/include/ibuf0ibuf.h +++ b/storage/innobase/include/ibuf0ibuf.h @@ -27,8 +27,6 @@ Created 7/19/1997 Heikki Tuuri #ifndef ibuf0ibuf_h #define ibuf0ibuf_h -#include "univ.i" - #include "mtr0mtr.h" #include "dict0mem.h" #include "fsp0fsp.h" diff --git a/storage/innobase/include/lock0iter.h b/storage/innobase/include/lock0iter.h index ca97d22556a..7b475116857 100644 --- a/storage/innobase/include/lock0iter.h +++ b/storage/innobase/include/lock0iter.h @@ -26,7 +26,6 @@ Created July 16, 2007 Vasil Dimov #ifndef lock0iter_h #define lock0iter_h -#include "univ.i" #include "lock0types.h" struct lock_queue_iterator_t { diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h index 0f6fe158264..701c79b8727 100644 --- a/storage/innobase/include/lock0lock.h +++ b/storage/innobase/include/lock0lock.h @@ -27,12 +27,10 @@ Created 5/7/1996 Heikki Tuuri #ifndef lock0lock_h #define lock0lock_h -#include "univ.i" #include "buf0types.h" #include "trx0types.h" #include "mtr0types.h" #include "rem0types.h" -#include "dict0types.h" #include "que0types.h" #include "lock0types.h" #include "hash0hash.h" diff --git a/storage/innobase/include/lock0prdt.h b/storage/innobase/include/lock0prdt.h index 9eb38ff8975..629cd05122a 100644 --- a/storage/innobase/include/lock0prdt.h +++ b/storage/innobase/include/lock0prdt.h @@ -26,7 +26,6 @@ Created 9/7/2013 Jimmy Yang #ifndef lock0prdt_h #define lock0prdt_h -#include "univ.i" #include "lock0lock.h" /* Predicate lock data */ diff --git a/storage/innobase/include/lock0priv.h b/storage/innobase/include/lock0priv.h index d9377e97d40..ab88f065809 100644 --- a/storage/innobase/include/lock0priv.h +++ b/storage/innobase/include/lock0priv.h @@ -34,7 +34,6 @@ those functions in lock/ */ #error Do not include lock0priv.h outside of the lock/ module #endif -#include "univ.i" #include "hash0hash.h" #include "trx0trx.h" diff --git a/storage/innobase/include/lock0types.h b/storage/innobase/include/lock0types.h index 1aac5d20a59..6157f095c5b 100644 --- a/storage/innobase/include/lock0types.h +++ b/storage/innobase/include/lock0types.h @@ -24,6 +24,7 @@ The transaction lock system global types Created 5/7/1996 Heikki Tuuri *******************************************************/ +#include "dict0types.h" #include "ut0lst.h" #ifndef lock0types_h diff --git a/storage/innobase/include/log0log.h b/storage/innobase/include/log0log.h index b215ba34a77..d213a6c0884 100644 --- a/storage/innobase/include/log0log.h +++ b/storage/innobase/include/log0log.h @@ -34,7 +34,6 @@ Created 12/9/1995 Heikki Tuuri #ifndef log0log_h #define log0log_h -#include "univ.i" #include "dyn0buf.h" #include "sync0rw.h" #include "log0types.h" diff --git a/storage/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h index 684a3155a16..bcf71ea6b17 100644 --- a/storage/innobase/include/mach0data.h +++ b/storage/innobase/include/mach0data.h @@ -28,9 +28,10 @@ Created 11/28/1995 Heikki Tuuri #ifndef mach0data_h #define mach0data_h +#include "univ.i" + #ifndef UNIV_INNOCHECKSUM -#include "univ.i" #include "mtr0types.h" /* The data and all fields are always stored in a database file diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h index f299fc84b5e..a2d676e7f2a 100644 --- a/storage/innobase/include/mem0mem.h +++ b/storage/innobase/include/mem0mem.h @@ -27,9 +27,7 @@ Created 6/9/1994 Heikki Tuuri #ifndef mem0mem_h #define mem0mem_h -#include "univ.i" #include "ut0mem.h" -#include "ut0byte.h" #include "ut0rnd.h" #include "mach0data.h" diff --git a/storage/innobase/include/mtr0log.h b/storage/innobase/include/mtr0log.h index d6b32374c42..d2de11b3470 100644 --- a/storage/innobase/include/mtr0log.h +++ b/storage/innobase/include/mtr0log.h @@ -26,7 +26,6 @@ Created 12/7/1995 Heikki Tuuri #ifndef mtr0log_h #define mtr0log_h -#include "univ.i" #include "mtr0mtr.h" #include "dyn0buf.h" diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h index c1281af2b30..fe4c36f0010 100644 --- a/storage/innobase/include/mtr0mtr.h +++ b/storage/innobase/include/mtr0mtr.h @@ -28,7 +28,6 @@ Created 11/26/1995 Heikki Tuuri #ifndef mtr0mtr_h #define mtr0mtr_h -#include "univ.i" #include "fil0fil.h" #include "dyn0buf.h" diff --git a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic index 895f82cf2d8..533afb88e3d 100644 --- a/storage/innobase/include/os0file.ic +++ b/storage/innobase/include/os0file.ic @@ -24,8 +24,6 @@ The interface to the operating system file io Created 2/20/2010 Jimmy Yang *******************************************************/ -#include "univ.i" - #ifdef UNIV_PFS_IO /** NOTE! Please use the corresponding macro os_file_create_simple(), not directly this function! diff --git a/storage/innobase/include/page0cur.h b/storage/innobase/include/page0cur.h index d98dfa5ec07..3ab310f97f2 100644 --- a/storage/innobase/include/page0cur.h +++ b/storage/innobase/include/page0cur.h @@ -27,8 +27,6 @@ Created 10/4/1994 Heikki Tuuri #ifndef page0cur_h #define page0cur_h -#include "univ.i" - #include "buf0types.h" #include "page0page.h" #include "rem0rec.h" @@ -36,7 +34,6 @@ Created 10/4/1994 Heikki Tuuri #include "mtr0mtr.h" #include "gis0type.h" - #ifdef UNIV_DEBUG /*********************************************************//** Gets pointer to the page frame where the cursor is positioned. diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h index a46184b5982..0ff63f8047f 100644 --- a/storage/innobase/include/page0page.h +++ b/storage/innobase/include/page0page.h @@ -26,8 +26,6 @@ Created 2/2/1994 Heikki Tuuri #ifndef page0page_h #define page0page_h -#include "univ.i" - #include "page0types.h" #ifndef UNIV_INNOCHECKSUM #include "fil0fil.h" diff --git a/storage/innobase/include/page0size.h b/storage/innobase/include/page0size.h index 7b8b7efe617..981f8743960 100644 --- a/storage/innobase/include/page0size.h +++ b/storage/innobase/include/page0size.h @@ -27,7 +27,6 @@ Created Nov 14, 2013 Vasil Dimov #ifndef page0size_t #define page0size_t -#include "univ.i" #include "fsp0types.h" #define FIELD_REF_SIZE 20U diff --git a/storage/innobase/include/page0types.h b/storage/innobase/include/page0types.h index 53a03466dde..47d66df2758 100644 --- a/storage/innobase/include/page0types.h +++ b/storage/innobase/include/page0types.h @@ -26,7 +26,6 @@ Created 2/2/1994 Heikki Tuuri #ifndef page0types_h #define page0types_h -#include "univ.i" #include "dict0types.h" #include "mtr0types.h" diff --git a/storage/innobase/include/page0zip.h b/storage/innobase/include/page0zip.h index 6e0c097bbaf..a2910a73634 100644 --- a/storage/innobase/include/page0zip.h +++ b/storage/innobase/include/page0zip.h @@ -34,7 +34,6 @@ Created June 2005 by Marko Makela #endif #ifdef UNIV_INNOCHECKSUM -#include "univ.i" #include "buf0buf.h" #include "ut0crc32.h" #include "buf0checksum.h" diff --git a/storage/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h index d9debcf325e..3d5468b8a5e 100644 --- a/storage/innobase/include/pars0opt.h +++ b/storage/innobase/include/pars0opt.h @@ -27,10 +27,8 @@ Created 12/21/1997 Heikki Tuuri #ifndef pars0opt_h #define pars0opt_h -#include "univ.i" #include "que0types.h" #include "pars0sym.h" -#include "dict0types.h" #include "row0sel.h" /*******************************************************************//** diff --git a/storage/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h index 487ba8c147f..fba42be413f 100644 --- a/storage/innobase/include/pars0pars.h +++ b/storage/innobase/include/pars0pars.h @@ -27,7 +27,6 @@ Created 11/19/1996 Heikki Tuuri #ifndef pars0pars_h #define pars0pars_h -#include "univ.i" #include "que0types.h" #include "pars0types.h" #include "row0types.h" diff --git a/storage/innobase/include/pars0sym.h b/storage/innobase/include/pars0sym.h index 920087b96c2..c9a5bb5fac2 100644 --- a/storage/innobase/include/pars0sym.h +++ b/storage/innobase/include/pars0sym.h @@ -27,9 +27,7 @@ Created 12/15/1997 Heikki Tuuri #ifndef pars0sym_h #define pars0sym_h -#include "univ.i" #include "que0types.h" -#include "dict0types.h" #include "pars0types.h" #include "row0types.h" diff --git a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h index ca06f5b09ba..ffca9034b38 100644 --- a/storage/innobase/include/que0que.h +++ b/storage/innobase/include/que0que.h @@ -27,9 +27,7 @@ Created 5/27/1996 Heikki Tuuri #ifndef que0que_h #define que0que_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0trx.h" #include "trx0roll.h" #include "srv0srv.h" diff --git a/storage/innobase/include/que0types.h b/storage/innobase/include/que0types.h index 0f11cad301a..017e5df9a6f 100644 --- a/storage/innobase/include/que0types.h +++ b/storage/innobase/include/que0types.h @@ -27,7 +27,6 @@ Created 5/27/1996 Heikki Tuuri #define que0types_h #include "data0data.h" -#include "dict0types.h" /* Pseudotype for all graph nodes */ typedef void que_node_t; diff --git a/storage/innobase/include/read0types.h b/storage/innobase/include/read0types.h index eade82714c5..52338889c47 100644 --- a/storage/innobase/include/read0types.h +++ b/storage/innobase/include/read0types.h @@ -27,10 +27,9 @@ Created 2/16/1997 Heikki Tuuri #ifndef read0types_h #define read0types_h -#include <algorithm> #include "dict0mem.h" - #include "trx0types.h" +#include <algorithm> /** View is not visible to purge thread. */ diff --git a/storage/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h index 899624a003e..e7030915292 100644 --- a/storage/innobase/include/rem0cmp.h +++ b/storage/innobase/include/rem0cmp.h @@ -29,7 +29,6 @@ Created 7/1/1994 Heikki Tuuri #include "data0data.h" #include "data0type.h" -#include "dict0types.h" #include "rem0types.h" #include "page0types.h" diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h index a3bd2c8cb50..3a541289a61 100644 --- a/storage/innobase/include/rem0rec.h +++ b/storage/innobase/include/rem0rec.h @@ -28,7 +28,6 @@ Created 5/30/1994 Heikki Tuuri #define rem0rec_h #ifndef UNIV_INNOCHECKSUM -#include "univ.i" #include "data0data.h" #include "rem0types.h" #include "mtr0types.h" diff --git a/storage/innobase/include/row0ext.h b/storage/innobase/include/row0ext.h index 050bc37850b..fe4bd710156 100644 --- a/storage/innobase/include/row0ext.h +++ b/storage/innobase/include/row0ext.h @@ -26,12 +26,11 @@ Created September 2006 Marko Makela #ifndef row0ext_h #define row0ext_h -#include "univ.i" -#include "row0types.h" #include "data0types.h" #include "mem0mem.h" #include "dict0types.h" #include "page0size.h" +#include "row0types.h" /********************************************************************//** Creates a cache of column prefixes of externally stored columns. diff --git a/storage/innobase/include/row0ftsort.h b/storage/innobase/include/row0ftsort.h index 3ae5d5bc175..0c2ffdb46ea 100644 --- a/storage/innobase/include/row0ftsort.h +++ b/storage/innobase/include/row0ftsort.h @@ -27,16 +27,11 @@ Created 10/13/2010 Jimmy Yang #ifndef row0ftsort_h #define row0ftsort_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" -#include "row0mysql.h" #include "fts0fts.h" -#include "fts0types.h" #include "fts0priv.h" #include "row0merge.h" #include "btr0bulk.h" -#include "os0thread.h" /** This structure defineds information the scan thread will fetch and put to the linked list for parallel tokenization/sort threads diff --git a/storage/innobase/include/row0import.h b/storage/innobase/include/row0import.h index 5eb5425b983..94df1a61341 100644 --- a/storage/innobase/include/row0import.h +++ b/storage/innobase/include/row0import.h @@ -27,7 +27,6 @@ Created 2012-02-08 by Sunny Bains #ifndef row0import_h #define row0import_h -#include "univ.i" #include "dict0types.h" // Forward declarations diff --git a/storage/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h index 6d3dc64211f..8ad955e8ed5 100644 --- a/storage/innobase/include/row0ins.h +++ b/storage/innobase/include/row0ins.h @@ -27,10 +27,8 @@ Created 4/20/1996 Heikki Tuuri #ifndef row0ins_h #define row0ins_h -#include "univ.i" #include "data0data.h" #include "que0types.h" -#include "dict0types.h" #include "trx0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0log.h b/storage/innobase/include/row0log.h index 723cf310f95..fa6592f4628 100644 --- a/storage/innobase/include/row0log.h +++ b/storage/innobase/include/row0log.h @@ -27,14 +27,12 @@ Created 2011-05-26 Marko Makela #ifndef row0log_h #define row0log_h -#include "univ.i" +#include "que0types.h" #include "mtr0types.h" #include "row0types.h" #include "rem0types.h" #include "data0types.h" -#include "dict0types.h" #include "trx0types.h" -#include "que0types.h" class ut_stage_alter_t; diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h index ad4005239c3..7d49f0ee346 100644 --- a/storage/innobase/include/row0merge.h +++ b/storage/innobase/include/row0merge.h @@ -27,11 +27,8 @@ Created 13/06/2005 Jan Lindstrom #ifndef row0merge_h #define row0merge_h -#include "univ.i" -#include "data0data.h" -#include "dict0types.h" -#include "trx0types.h" #include "que0types.h" +#include "trx0types.h" #include "mtr0mtr.h" #include "rem0types.h" #include "rem0rec.h" diff --git a/storage/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h index 8130f733806..fb385dbf2ac 100644 --- a/storage/innobase/include/row0mysql.h +++ b/storage/innobase/include/row0mysql.h @@ -28,9 +28,7 @@ Created 9/17/2000 Heikki Tuuri #ifndef row0mysql_h #define row0mysql_h -#include "data0data.h" #include "que0types.h" -#include "dict0types.h" #include "trx0types.h" #include "row0types.h" #include "btr0types.h" @@ -389,35 +387,6 @@ row_create_index_for_mysql( large. */ MY_ATTRIBUTE((warn_unused_result)); /*********************************************************************//** -Scans a table create SQL string and adds to the data dictionary -the foreign key constraints declared in the string. This function -should be called after the indexes for a table have been created. -Each foreign key constraint must be accompanied with indexes in -bot participating tables. The indexes are allowed to contain more -fields than mentioned in the constraint. - -@param[in] trx transaction (NULL if not adding to dictionary) -@param[in] sql_string table create statement where - foreign keys are declared like: - FOREIGN KEY (a, b) REFERENCES table2(c, d), - table2 can be written also with the database - name before it: test.table2; the default - database id the database of parameter name -@param[in] sql_length length of sql_string -@param[in] name table full name in normalized form -@param[in] reject_fks whether to fail with DB_CANNOT_ADD_CONSTRAINT - if any foreign keys are found -@return error code or DB_SUCCESS */ -dberr_t -row_table_add_foreign_constraints( - trx_t* trx, - const char* sql_string, - size_t sql_length, - const char* name, - bool reject_fks) - MY_ATTRIBUTE((warn_unused_result)); - -/*********************************************************************//** The master thread in srv0srv.cc calls this regularly to drop tables which we must drop in background after queries to them have ended. Such lazy dropping of tables is needed in ALTER TABLE on Unix. diff --git a/storage/innobase/include/row0purge.h b/storage/innobase/include/row0purge.h index a7ddef4fe8a..25cd43979bf 100644 --- a/storage/innobase/include/row0purge.h +++ b/storage/innobase/include/row0purge.h @@ -27,13 +27,10 @@ Created 3/14/1997 Heikki Tuuri #ifndef row0purge_h #define row0purge_h -#include "univ.i" -#include "data0data.h" +#include "que0types.h" #include "btr0types.h" #include "btr0pcur.h" -#include "dict0types.h" #include "trx0types.h" -#include "que0types.h" #include "row0types.h" #include "ut0vec.h" #include "row0mysql.h" diff --git a/storage/innobase/include/row0quiesce.h b/storage/innobase/include/row0quiesce.h index 4519e2487ce..de267f17405 100644 --- a/storage/innobase/include/row0quiesce.h +++ b/storage/innobase/include/row0quiesce.h @@ -28,7 +28,6 @@ Created 2012-02-08 by Sunny Bains #ifndef row0quiesce_h #define row0quiesce_h -#include "univ.i" #include "dict0types.h" struct trx_t; diff --git a/storage/innobase/include/row0row.h b/storage/innobase/include/row0row.h index ed69309bc50..630a40b0765 100644 --- a/storage/innobase/include/row0row.h +++ b/storage/innobase/include/row0row.h @@ -27,12 +27,9 @@ Created 4/20/1996 Heikki Tuuri #ifndef row0row_h #define row0row_h -#include "univ.i" -#include "data0data.h" -#include "dict0types.h" +#include "que0types.h" #include "ibuf0ibuf.h" #include "trx0types.h" -#include "que0types.h" #include "mtr0mtr.h" #include "rem0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h index ef0ccbbda9f..1e58686dfcb 100644 --- a/storage/innobase/include/row0sel.h +++ b/storage/innobase/include/row0sel.h @@ -27,10 +27,8 @@ Created 12/19/1997 Heikki Tuuri #ifndef row0sel_h #define row0sel_h -#include "univ.i" #include "data0data.h" #include "que0types.h" -#include "dict0types.h" #include "trx0types.h" #include "read0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0uins.h b/storage/innobase/include/row0uins.h index 15e6c33e55e..3d349287bc3 100644 --- a/storage/innobase/include/row0uins.h +++ b/storage/innobase/include/row0uins.h @@ -27,9 +27,7 @@ Created 2/25/1997 Heikki Tuuri #ifndef row0uins_h #define row0uins_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0types.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0umod.h b/storage/innobase/include/row0umod.h index ef2dd491efd..59d53f60783 100644 --- a/storage/innobase/include/row0umod.h +++ b/storage/innobase/include/row0umod.h @@ -27,9 +27,7 @@ Created 2/27/1997 Heikki Tuuri #ifndef row0umod_h #define row0umod_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0types.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h index f7cec643b33..5ac2c7c5ee0 100644 --- a/storage/innobase/include/row0undo.h +++ b/storage/innobase/include/row0undo.h @@ -27,13 +27,9 @@ Created 1/8/1997 Heikki Tuuri #ifndef row0undo_h #define row0undo_h -#include "univ.i" -#include "mtr0mtr.h" #include "trx0sys.h" #include "btr0types.h" #include "btr0pcur.h" -#include "dict0types.h" -#include "trx0types.h" #include "que0types.h" #include "row0types.h" diff --git a/storage/innobase/include/row0upd.h b/storage/innobase/include/row0upd.h index 5e01e513a50..742f897f3ec 100644 --- a/storage/innobase/include/row0upd.h +++ b/storage/innobase/include/row0upd.h @@ -30,7 +30,6 @@ Created 12/27/1996 Heikki Tuuri #include "data0data.h" #include "row0types.h" #include "btr0types.h" -#include "dict0types.h" #include "trx0types.h" #include "btr0pcur.h" #include "que0types.h" diff --git a/storage/innobase/include/row0vers.h b/storage/innobase/include/row0vers.h index 9869a3acf95..dd438c366a8 100644 --- a/storage/innobase/include/row0vers.h +++ b/storage/innobase/include/row0vers.h @@ -27,9 +27,7 @@ Created 2/6/1997 Heikki Tuuri #ifndef row0vers_h #define row0vers_h -#include "univ.i" #include "data0data.h" -#include "dict0types.h" #include "trx0types.h" #include "que0types.h" #include "rem0types.h" diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index ba5dd5852b7..c6873ca8938 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -42,20 +42,17 @@ Created 10/10/1995 Heikki Tuuri #ifndef srv0srv_h #define srv0srv_h -#include "univ.i" - -#include "mysql/psi/mysql_stage.h" -#include "mysql/psi/psi.h" - #include "log0log.h" #include "os0event.h" #include "que0types.h" #include "trx0types.h" #include "srv0conc.h" #include "buf0checksum.h" -#include "ut0counter.h" #include "fil0fil.h" +#include "mysql/psi/mysql_stage.h" +#include "mysql/psi/psi.h" + /** Global counters used inside InnoDB. */ struct srv_stats_t { diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h index ee263f6c1f6..c2665a360cc 100644 --- a/storage/innobase/include/srv0start.h +++ b/storage/innobase/include/srv0start.h @@ -27,7 +27,6 @@ Created 10/10/1995 Heikki Tuuri #ifndef srv0start_h #define srv0start_h -#include "univ.i" #include "log0log.h" #include "ut0byte.h" diff --git a/storage/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h index b3180c1779d..2fefd4ed7c3 100644 --- a/storage/innobase/include/sync0arr.h +++ b/storage/innobase/include/sync0arr.h @@ -28,7 +28,6 @@ Created 9/5/1995 Heikki Tuuri #define sync0arr_h #include "univ.i" -#include "os0thread.h" /** Synchronization wait array cell */ struct sync_cell_t; diff --git a/storage/innobase/include/sync0debug.h b/storage/innobase/include/sync0debug.h index ecc742918f0..ccd5b9c2321 100644 --- a/storage/innobase/include/sync0debug.h +++ b/storage/innobase/include/sync0debug.h @@ -34,7 +34,6 @@ Created 2012-08-21 Sunny Bains #define sync0debug_h #include "univ.i" -#include "sync0types.h" /** Initializes the synchronization data structures. */ void diff --git a/storage/innobase/include/sync0policy.h b/storage/innobase/include/sync0policy.h index daa08a91e1e..93a56e24040 100644 --- a/storage/innobase/include/sync0policy.h +++ b/storage/innobase/include/sync0policy.h @@ -27,10 +27,8 @@ Created 2012-08-21 Sunny Bains. #ifndef sync0policy_h #define sync0policy_h -#include "univ.i" #include "ut0rnd.h" #include "os0thread.h" -#include "sync0types.h" #include "srv0mon.h" #ifdef UNIV_DEBUG diff --git a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h index b61553fc380..429560f637e 100644 --- a/storage/innobase/include/sync0rw.h +++ b/storage/innobase/include/sync0rw.h @@ -34,8 +34,6 @@ Created 9/11/1995 Heikki Tuuri #ifndef sync0rw_h #define sync0rw_h -#include "univ.i" -#include "ut0counter.h" #include "os0event.h" #include "ut0mutex.h" diff --git a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h index ffa682b46db..5af2cbfe6c5 100644 --- a/storage/innobase/include/sync0sync.h +++ b/storage/innobase/include/sync0sync.h @@ -35,7 +35,6 @@ Created 9/5/1995 Heikki Tuuri #define sync0sync_h #include "univ.i" -#include "ut0counter.h" #if defined UNIV_PFS_MUTEX || defined UNIV_PFS_RWLOCK diff --git a/storage/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h index 773c610d30e..53332af46ab 100644 --- a/storage/innobase/include/sync0types.h +++ b/storage/innobase/include/sync0types.h @@ -28,11 +28,9 @@ Created 9/5/1995 Heikki Tuuri #define sync0types_h #include <vector> -#include <iostream> #include <my_atomic.h> #include "ut0new.h" -#include "ut0counter.h" #ifdef _WIN32 /** Native mutex */ diff --git a/storage/innobase/include/trx0i_s.h b/storage/innobase/include/trx0i_s.h index ee7da7b74dc..b1145f33586 100644 --- a/storage/innobase/include/trx0i_s.h +++ b/storage/innobase/include/trx0i_s.h @@ -29,7 +29,6 @@ Created July 17, 2007 Vasil Dimov #ifndef trx0i_s_h #define trx0i_s_h -#include "univ.i" #include "trx0types.h" #include "dict0types.h" diff --git a/storage/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h index 776757b32ec..bf8835f189f 100644 --- a/storage/innobase/include/trx0rec.h +++ b/storage/innobase/include/trx0rec.h @@ -27,12 +27,9 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0rec_h #define trx0rec_h -#include "univ.i" #include "trx0types.h" #include "row0types.h" #include "mtr0mtr.h" -#include "dict0types.h" -#include "data0data.h" #include "rem0types.h" #include "page0types.h" #include "row0log.h" diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h index af5ed73f04b..b74b56eae98 100644 --- a/storage/innobase/include/trx0roll.h +++ b/storage/innobase/include/trx0roll.h @@ -27,9 +27,7 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0roll_h #define trx0roll_h -#include "univ.i" #include "trx0trx.h" -#include "trx0types.h" #include "mtr0mtr.h" #include "trx0sys.h" diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h index f7e6d01c9bc..8c5be47fb85 100644 --- a/storage/innobase/include/trx0sys.h +++ b/storage/innobase/include/trx0sys.h @@ -27,8 +27,6 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0sys_h #define trx0sys_h -#include "univ.i" - #include "buf0buf.h" #include "fil0fil.h" #include "trx0types.h" diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 4252f1aaabd..9fb65c19911 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -27,9 +27,7 @@ Created 3/26/1996 Heikki Tuuri #ifndef trx0trx_h #define trx0trx_h -#include "dict0types.h" #include "trx0types.h" - #include "lock0types.h" #include "que0types.h" #include "mem0mem.h" diff --git a/storage/innobase/include/ut0counter.h b/storage/innobase/include/ut0counter.h index 6e36f117fff..ab694386099 100644 --- a/storage/innobase/include/ut0counter.h +++ b/storage/innobase/include/ut0counter.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2012, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, MariaDB Corporation. +Copyright (c) 2017, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -28,9 +28,8 @@ Created 2012/04/12 by Sunny Bains #ifndef ut0counter_h #define ut0counter_h -#include <my_rdtsc.h> -#include "univ.i" #include "os0thread.h" +#include "my_rdtsc.h" #include "my_atomic.h" /** CPU cache line size */ diff --git a/storage/innobase/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h index 6672be62617..0c8328449db 100644 --- a/storage/innobase/include/ut0dbg.h +++ b/storage/innobase/include/ut0dbg.h @@ -35,8 +35,6 @@ Created 1/30/1994 Heikki Tuuri /* Do not include univ.i because univ.i includes this. */ -#include "os0thread.h" - /*************************************************************//** Report a failed assertion. */ ATTRIBUTE_NORETURN ATTRIBUTE_COLD __attribute__((nonnull(2))) diff --git a/storage/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h index 9e94216f47b..c2c05767e07 100644 --- a/storage/innobase/include/ut0mem.h +++ b/storage/innobase/include/ut0mem.h @@ -26,7 +26,6 @@ Created 5/30/1994 Heikki Tuuri #ifndef ut0mem_h #define ut0mem_h -#include "univ.i" #include "os0event.h" #include "ut0mutex.h" diff --git a/storage/innobase/include/ut0rbt.h b/storage/innobase/include/ut0rbt.h index 2fea7187a65..829c9363473 100644 --- a/storage/innobase/include/ut0rbt.h +++ b/storage/innobase/include/ut0rbt.h @@ -26,7 +26,6 @@ Created 2007-03-20 Sunny Bains #define INNOBASE_UT0RBT_H #if !defined(IB_RBT_TESTING) -#include "univ.i" #include "ut0mem.h" #else #include <stdio.h> diff --git a/storage/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h index 5baf8684d23..280ee772589 100644 --- a/storage/innobase/include/ut0rnd.h +++ b/storage/innobase/include/ut0rnd.h @@ -26,12 +26,9 @@ Created 1/20/1994 Heikki Tuuri #ifndef ut0rnd_h #define ut0rnd_h -#include "univ.i" - -#ifndef UNIV_INNOCHECKSUM - #include "ut0byte.h" +#ifndef UNIV_INNOCHECKSUM /** The 'character code' for end of field or string (used in folding records */ #define UT_END_OF_FIELD 257 diff --git a/storage/innobase/include/ut0sort.h b/storage/innobase/include/ut0sort.h index 75648b5c317..5b132f2bfbd 100644 --- a/storage/innobase/include/ut0sort.h +++ b/storage/innobase/include/ut0sort.h @@ -26,8 +26,6 @@ Created 11/9/1995 Heikki Tuuri #ifndef ut0sort_h #define ut0sort_h -#include "univ.i" - /* This module gives a macro definition of the body of a standard sort function for an array of elements of any type. The comparison function is given as a parameter to diff --git a/storage/innobase/include/ut0stage.h b/storage/innobase/include/ut0stage.h index 4b96fad3c21..e2e840afbc5 100644 --- a/storage/innobase/include/ut0stage.h +++ b/storage/innobase/include/ut0stage.h @@ -35,8 +35,6 @@ Created Nov 12, 2014 Vasil Dimov #include "mysql/psi/mysql_stage.h" /* mysql_stage_inc_work_completed */ #include "mysql/psi/psi.h" /* HAVE_PSI_STAGE_INTERFACE, PSI_stage_progress */ -#include "univ.i" - #include "dict0mem.h" /* dict_index_t */ #include "row0log.h" /* row_log_estimate_work() */ #include "srv0srv.h" /* ut_stage_alter_t */ diff --git a/storage/innobase/include/ut0vec.h b/storage/innobase/include/ut0vec.h index 13b561a3a4f..c23b1844349 100644 --- a/storage/innobase/include/ut0vec.h +++ b/storage/innobase/include/ut0vec.h @@ -26,7 +26,6 @@ Created 4/6/2006 Osku Salerma #ifndef IB_VECTOR_H #define IB_VECTOR_H -#include "univ.i" #include "mem0mem.h" struct ib_alloc_t; diff --git a/storage/innobase/lock/lock0iter.cc b/storage/innobase/lock/lock0iter.cc index db30bcf1ca6..071031748b7 100644 --- a/storage/innobase/lock/lock0iter.cc +++ b/storage/innobase/lock/lock0iter.cc @@ -26,7 +26,6 @@ Created July 16, 2007 Vasil Dimov #define LOCK_MODULE_IMPLEMENTATION -#include "univ.i" #include "dict0mem.h" #include "lock0iter.h" #include "lock0lock.h" diff --git a/storage/innobase/os/os0thread.cc b/storage/innobase/os/os0thread.cc index 5341e417d8d..e0996e45880 100644 --- a/storage/innobase/os/os0thread.cc +++ b/storage/innobase/os/os0thread.cc @@ -25,7 +25,6 @@ Created 9/8/1995 Heikki Tuuri *******************************************************/ #include "univ.i" -#include "os0thread.h" #include "srv0srv.h" /** Number of threads active. */ diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index e34d96f51dd..1fdd2ac9b94 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -28,6 +28,7 @@ Created 2012-02-08 by Sunny Bains. #include "btr0pcur.h" #include "que0que.h" #include "dict0boot.h" +#include "dict0load.h" #include "ibuf0ibuf.h" #include "pars0pars.h" #include "row0sel.h" diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index b7c1e509b61..757a9ff232a 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -2594,90 +2594,6 @@ row_create_index_for_mysql( } /*********************************************************************//** -Scans a table create SQL string and adds to the data dictionary -the foreign key constraints declared in the string. This function -should be called after the indexes for a table have been created. -Each foreign key constraint must be accompanied with indexes in -bot participating tables. The indexes are allowed to contain more -fields than mentioned in the constraint. - -@param[in] trx transaction (NULL if not adding to dictionary) -@param[in] sql_string table create statement where - foreign keys are declared like: - FOREIGN KEY (a, b) REFERENCES table2(c, d), - table2 can be written also with the database - name before it: test.table2; the default - database id the database of parameter name -@param[in] sql_length length of sql_string -@param[in] name table full name in normalized form -@param[in] reject_fks whether to fail with DB_CANNOT_ADD_CONSTRAINT - if any foreign keys are found -@return error code or DB_SUCCESS */ -dberr_t -row_table_add_foreign_constraints( - trx_t* trx, - const char* sql_string, - size_t sql_length, - const char* name, - bool reject_fks) -{ - dberr_t err; - - DBUG_ENTER("row_table_add_foreign_constraints"); - - ut_ad(mutex_own(&dict_sys->mutex)); - ut_ad(rw_lock_own(dict_operation_lock, RW_LOCK_X)); - ut_a(sql_string); - - if (trx) { - err = dict_create_foreign_constraints( - trx, sql_string, sql_length, name, reject_fks); - - DBUG_EXECUTE_IF("ib_table_add_foreign_fail", - err = DB_DUPLICATE_KEY;); - - DEBUG_SYNC_C("table_add_foreign_constraints"); - } else { - err = DB_SUCCESS; - } - - if (err == DB_SUCCESS) { - /* Check that also referencing constraints are ok */ - dict_names_t fk_tables; - err = dict_load_foreigns(name, NULL, false, true, - DICT_ERR_IGNORE_NONE, fk_tables); - - while (err == DB_SUCCESS && !fk_tables.empty()) { - dict_load_table(fk_tables.front(), true, - DICT_ERR_IGNORE_NONE); - fk_tables.pop_front(); - } - } - - if (err != DB_SUCCESS && trx) { - /* We have special error handling here */ - - trx->error_state = DB_SUCCESS; - - if (trx_is_started(trx)) { - - trx_rollback_to_savepoint(trx, NULL); - } - - row_drop_table_for_mysql(name, trx, SQLCOM_DROP_TABLE, true); - - if (trx_is_started(trx)) { - - trx_commit_for_mysql(trx); - } - - trx->error_state = DB_SUCCESS; - } - - DBUG_RETURN(err); -} - -/*********************************************************************//** Drops a table for MySQL as a background operation. MySQL relies on Unix in ALTER TABLE to the fact that the table handler does not remove the table before all handles to it has been removed. Furhermore, the MySQL's diff --git a/storage/innobase/sync/sync0sync.cc b/storage/innobase/sync/sync0sync.cc index a64290fda4a..3873e8532e7 100644 --- a/storage/innobase/sync/sync0sync.cc +++ b/storage/innobase/sync/sync0sync.cc @@ -30,7 +30,6 @@ Mutex, the basic synchronization primitive Created 9/5/1995 Heikki Tuuri *******************************************************/ -#include "univ.i" #include "sync0rw.h" #include "sync0sync.h" diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc index 180cbb26459..965faaba478 100644 --- a/storage/innobase/trx/trx0i_s.cc +++ b/storage/innobase/trx/trx0i_s.cc @@ -29,13 +29,6 @@ table cache" for later retrieval. Created July 17, 2007 Vasil Dimov *******************************************************/ -/* Found during the build of 5.5.3 on Linux 2.4 and early 2.6 kernels: - The includes "univ.i" -> "my_global.h" cause a different path - to be taken further down with pthread functions and types, - so they must come first. - From the symptoms, this is related to bug#46587 in the MySQL bug DB. -*/ - #include "trx0i_s.h" #include "buf0buf.h" #include "dict0dict.h" diff --git a/storage/innobase/ut/ut0crc32.cc b/storage/innobase/ut/ut0crc32.cc index 284ea859013..5d95202b7c9 100644 --- a/storage/innobase/ut/ut0crc32.cc +++ b/storage/innobase/ut/ut0crc32.cc @@ -83,7 +83,6 @@ mysys/my_perf.c, contributed by Facebook under the following license. #include "my_config.h" #include <string.h> -#include "univ.i" #include "ut0crc32.h" #ifdef _MSC_VER |