cleanup: include/have_rbr_triggers.inc

this is always enabled now,
no need for a conditional

4 files changed, 0 insertions, 81 deletions

diff --git a/mysql-test/include/have_rbr_triggers.inc b/mysql-test/include/have_rbr_triggers.inc
deleted file mode 100644
index 9ccfc18bfde..00000000000
--- a/mysql-test/include/have_rbr_triggers.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-if (`select count(*) = 0 from information_schema.session_variables where variable_name = 'slave_run_triggers_for_rbr'`)
-{
-  skip RBR triggers are not available;
-}
-
diff --git a/mysql-test/suite/rpl/t/rpl_row_triggers.test b/mysql-test/suite/rpl/t/rpl_row_triggers.test
index 00f9197ace8..d5f29b9207d 100644
--- a/mysql-test/suite/rpl/t/rpl_row_triggers.test
+++ b/mysql-test/suite/rpl/t/rpl_row_triggers.test
@@ -1,5 +1,4 @@
 -- source include/have_binlog_format_row.inc
--- source include/have_rbr_triggers.inc
 -- source include/have_innodb.inc
 -- source include/master-slave.inc
 
diff --git a/mysql-test/suite/sys_vars/r/slave_run_triggers_for_rbr_basic.result b/mysql-test/suite/sys_vars/r/slave_run_triggers_for_rbr_basic.result
deleted file mode 100644
index 02a3cdf27ce..00000000000
--- a/mysql-test/suite/sys_vars/r/slave_run_triggers_for_rbr_basic.result
+++ /dev/null
@@ -1,45 +0,0 @@
-SET @old_slave_run_triggers_for_rbr= @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= NO;
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-NO
-SET @@global.slave_run_triggers_for_rbr= YES;
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-YES
-SET @@global.slave_run_triggers_for_rbr= LOGGING;
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-LOGGING
-SET @@global.slave_run_triggers_for_rbr= default;
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-NO
-SET @@global.slave_run_triggers_for_rbr= 0;
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-NO
-SET @@global.slave_run_triggers_for_rbr= 1;
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-YES
-SET @@global.slave_run_triggers_for_rbr= 2;
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-LOGGING
-SET @@global.slave_run_triggers_for_rbr= 3;
-ERROR 42000: Variable 'slave_run_triggers_for_rbr' can't be set to the value of '3'
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-LOGGING
-SET @@global.slave_run_triggers_for_rbr= "N";
-ERROR 42000: Variable 'slave_run_triggers_for_rbr' can't be set to the value of 'N'
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-LOGGING
-SET @@global.slave_run_triggers_for_rbr= -1;
-ERROR 42000: Variable 'slave_run_triggers_for_rbr' can't be set to the value of '-1'
-select @@global.slave_run_triggers_for_rbr;
-@@global.slave_run_triggers_for_rbr
-LOGGING
-SET @@global.slave_run_triggers_for_rbr= @old_slave_run_triggers_for_rbr;
diff --git a/mysql-test/suite/sys_vars/t/slave_run_triggers_for_rbr_basic.test b/mysql-test/suite/sys_vars/t/slave_run_triggers_for_rbr_basic.test
deleted file mode 100644
index ac5296677b9..00000000000
--- a/mysql-test/suite/sys_vars/t/slave_run_triggers_for_rbr_basic.test
+++ /dev/null
@@ -1,30 +0,0 @@
-
--- source include/have_rbr_triggers.inc
-
-SET @old_slave_run_triggers_for_rbr= @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= NO;
-select @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= YES;
-select @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= LOGGING;
-select @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= default;
-select @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= 0;
-select @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= 1;
-select @@global.slave_run_triggers_for_rbr;
-SET @@global.slave_run_triggers_for_rbr= 2;
-select @@global.slave_run_triggers_for_rbr;
---error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_run_triggers_for_rbr= 3;
-select @@global.slave_run_triggers_for_rbr;
---error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_run_triggers_for_rbr= "N";
-select @@global.slave_run_triggers_for_rbr;
---error ER_WRONG_VALUE_FOR_VAR
-SET @@global.slave_run_triggers_for_rbr= -1;
-select @@global.slave_run_triggers_for_rbr;
-
-
-SET @@global.slave_run_triggers_for_rbr= @old_slave_run_triggers_for_rbr;