Fixed failing tests

- Galera tests that was not updated with connection change
  messages
- Test where out of memory error was changed (We are now using the
  standard out of memory error in most places)
- Removed tokudb tests that uses include files that doesn't exist
  in MariaDB
- Removed not supported mariadb startup option from option file

mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result

+connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
 #Connection 2
+connection node_2;
 START SLAVE;
 #Connection 1
+connection node_1;
 CREATE TABLE t2 (f1 INTEGER PRIMARY KEY, f2 int unique) ENGINE=InnoDB;
 INSERT INTO t2 VALUES(1,11);
 INSERT INTO t2 VALUES(2,22);
@@ -10,6 +13,7 @@ SELECT @@global.gtid_binlog_state;
 1-1-4
 include/save_master_gtid.inc
 #Connection 2
+connection node_2;
 include/sync_with_master_gtid.inc
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
@@ -21,12 +25,14 @@ SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-4,2-2-3
 #Connection 3
+connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 INSERT INTO t2 VALUES(7,77);
 INSERT INTO t2 VALUES(8,88);
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-4,2-2-3,2-3-5
 #Connection 1
+connection node_1;
 CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
@@ -35,6 +41,7 @@ INSERT INTO t1 VALUES ('node1_committed_before');
 COMMIT;
 include/save_master_gtid.inc
 #Connection 2
+connection node_2;
 include/sync_with_master_gtid.inc
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
@@ -42,14 +49,19 @@ INSERT INTO t1 VALUES ('node2_committed_before');
 INSERT INTO t1 VALUES ('node2_committed_before');
 COMMIT;
 #Connection 3
+connection node_3;
+connection node_2;
+connection node_3;
 Shutting down server ...
 #Connection 2
+connection node_2;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES ('node1_committed_during');
 INSERT INTO t1 VALUES ('node1_committed_during');
 COMMIT;
 #Connection 3
+connection node_3;
 Starting server ...
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
@@ -57,6 +69,7 @@ INSERT INTO t1 VALUES ('node3_committed_after');
 INSERT INTO t1 VALUES ('node3_committed_after');
 COMMIT;
 #Connection 2
+connection node_2;
 Select * from t1 order by f1;
 f1
 node1_committed_before
@@ -68,6 +81,7 @@ node2_committed_before
 node3_committed_after
 node3_committed_after
 #Connection 3
+connection node_3;
 Select * from t1 order by f1;
 f1
 node1_committed_before
@@ -79,26 +93,34 @@ node2_committed_before
 node3_committed_after
 node3_committed_after
 #Connection 2
+connection node_2;
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-6,2-2-7,2-3-8
 #Connection 3
+connection node_3;
 SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-6,2-2-7,2-3-8
 #Connection 1
+connection node_1;
 SET AUTOCOMMIT=ON;
 #Connection 2
+connection node_2;
 SET AUTOCOMMIT=ON;
 #Connection 3
+connection node_3;
 SET AUTOCOMMIT=ON;
 #Connection 2
+connection node_2;
 STOP slave;
 INSERT INTO t1 VALUES ('node2_slave_stoped');
 #Connection 1
+connection node_1;
 INSERT INTO t1 VALUES ('node1_normal_entry');
 include/save_master_gtid.inc
 #Connection 2
+connection node_2;
 INSERT INTO t1 VALUES ('node2_slave_stoped_inserted');
 start slave;
 include/sync_with_master_gtid.inc
@@ -110,6 +132,7 @@ SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-7,2-3-8,2-2-11
 #Connection 3
+connection node_3;
 SELECT count(*) from t1;
 count(*)
 12
@@ -117,14 +140,20 @@ SELECT @@global.gtid_binlog_state;
 @@global.gtid_binlog_state
 1-1-7,2-3-8,2-2-11
 #Connection 1
+connection node_1;
 DROP TABLE t2,t1;
 #Connection 2
+connection node_2;
 #Connection 3
+connection node_3;
 #Connection 2
+connection node_2;
 STOP SLAVE;
 RESET SLAVE ALL;
 reset master;
 #Connection 3
+connection node_3;
 reset master;
 #Connection 1
+connection node_1;
 reset master;

mysql-test/suite/galera/r/galera_ist_progress.result

+connection node_2;
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate = 1';
+connection node_1;
+connection node_2;
 SET SESSION wsrep_on = OFF;
 SET SESSION wsrep_on = ON;
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t1 VALUES (2);
@@ -12,8 +16,13 @@ INSERT INTO t1 VALUES (7);
 INSERT INTO t1 VALUES (8);
 INSERT INTO t1 VALUES (9);
 INSERT INTO t1 VALUES (10);
+connection node_2;
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate = 0';
+connection node_1;
+connection node_2;
+connection node_1;
 include/assert_grep.inc [Receiving IST: 11 writesets, seqnos]
 include/assert_grep.inc [Receiving IST\.\.\.  0\.0% \( 0/11 events\) complete]
 include/assert_grep.inc [Receiving IST\.\.\.100\.0% \(11/11 events\) complete]
+connection node_1;
 DROP TABLE t1;

mysql-test/suite/galera/r/galera_many_columns.result

@@ -19,7 +19,7 @@ UPDATE t1 SET f2 = 'CDE' WHERE f1 = 'XYZ' AND f1017 = 'XYZ';
 COMMIT;
 connection node_1;
 COMMIT;
-ERROR 40001: wsrep aborted transaction
+ERROR 40001: Deadlock: wsrep aborted transaction
 ROLLBACK;
 connection node_2;
 ROLLBACK;

mysql-test/suite/galera/r/galera_many_rows.result

@@ -35,6 +35,6 @@ connection node_1;
 COMMIT;
 connection node_2;
 COMMIT;
-ERROR 40001: wsrep aborted transaction
+ERROR 40001: Deadlock: wsrep aborted transaction
 DROP TABLE t1;
 DROP TABLE ten;

mysql-test/suite/galera/r/galera_many_tables_nopk.result

@@ -18,6 +18,6 @@ connection node_1;
 COMMIT;
 connection node_2;
 COMMIT;
-ERROR 40001: wsrep aborted transaction
+ERROR 40001: Deadlock: wsrep aborted transaction
 DROP SCHEMA test;
 CREATE SCHEMA test;

mysql-test/suite/galera/r/galera_many_tables_pk.result

@@ -23,7 +23,7 @@ connection node_1;
 COMMIT;
 connection node_2;
 COMMIT;
-ERROR 40001: wsrep aborted transaction
+ERROR 40001: Deadlock: wsrep aborted transaction
 include/diff_servers.inc [servers=1 2]
 DROP SCHEMA test;
 CREATE SCHEMA test;

mysql-test/suite/innodb/r/innodb-wl5522-debug.result

@@ -323,7 +323,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_1";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -336,7 +336,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_2";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -349,7 +349,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_4";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -362,7 +362,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_5";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -375,7 +375,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_6";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -388,7 +388,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_7";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -401,7 +401,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_8";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -414,7 +414,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_9";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd
@@ -427,7 +427,7 @@ ERROR HY000: Tablespace has been discarded for table `t1`
 restore: t1 .ibd and .cfg files
 SET SESSION debug_dbug="+d,ib_import_OOM_10";
 ALTER TABLE test_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 DROP TABLE test_wl5522.t1;
 unlink: t1.ibd

mysql-test/suite/innodb_fts/r/misc_debug.result

@@ -7,7 +7,7 @@ FULLTEXT (title,body)
 SET @saved_debug_dbug = @@SESSION.debug_dbug;
 SET SESSION debug_dbug="+d,ib_dict_create_index_tree_fail";
 CREATE FULLTEXT INDEX idx ON articles(body);
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 SET SESSION debug_dbug=@saved_debug_dbug;
 ALTER TABLE articles STATS_PERSISTENT=DEFAULT;
 DROP TABLE articles;

mysql-test/suite/rpl/r/rpl_view_debug.result

@@ -23,7 +23,7 @@ v1
 connection master;
 set @@debug_dbug="d,simulate_register_view_failure";
 CREATE VIEW v2 as SELECT * FROM t1;
-ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
+ERROR HY000: Out of memory.
 show tables;
 Tables_in_test
 t1

storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_crash_safe.test

-# This test takes long time, so only run it with the --big-test mtr-flag.
---source include/big_test.inc
---source include/not_embedded.inc
---source include/not_valgrind.inc
---source include/have_debug.inc
---source include/have_tokudb.inc
---source include/have_binlog_format_row.inc
---source include/not_mts_slave_parallel_workers.inc
---source include/master-slave.inc
-
-call mtr.add_suppression('Attempting backtrace');
-call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
-call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
-
-let $engine_type=TokuDB;
-let $database_name=test;
---source extra/rpl_tests/rpl_crash_safe.test
---source include/rpl_end.inc

storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_mixed_crash_safe.test

---source include/big_test.inc
---source include/not_embedded.inc
---source include/not_valgrind.inc
---source include/have_debug.inc
---source include/have_tokudb.inc
---source include/have_binlog_format_mixed_or_statement.inc
---source include/not_mts_slave_parallel_workers.inc
---source include/master-slave.inc
-
-call mtr.add_suppression('Attempting backtrace');
-call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
-call mtr.add_suppression(".*  InnoDB: Warning: allocated tablespace .*, old maximum was .*");
-
-let $engine_type=TokuDB;
-let $database_name=test;
---source extra/rpl_tests/rpl_crash_safe.test
---source include/rpl_end.inc

storage/tokudb/mysql-test/tokudb_parts/t/partition_debug_tokudb-master.opt

---innodb-file-format-check --innodb-file-per-table=1
+--innodb-file-per-table=1