diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index 5627716f6ec..abe391c8ce8 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -622,6 +622,12 @@ The following options may be given as the first argument:
                       Number of times the slave SQL thread will retry a
                       transaction in case it failed with a deadlock or elapsed
                       lock wait timeout, before giving up and stopping
+  --slave-type-conversions=name 
+                      Set of slave type conversions that are enabled. Legal
+                      values are: ALL_LOSSY to enable lossy conversions and
+                      ALL_NON_LOSSY to enable non-lossy conversions. If the
+                      variable is assigned the empty set, no conversions are
+                      allowed and it is expected that the types match exactly.
   --slow-launch-time=# 
                       If creating the thread takes longer than this value (in
                       seconds), the Slow_launch_threads counter will be
diff --git a/mysql-test/suite/rpl/r/rpl_row_idempotency.result b/mysql-test/suite/rpl/r/rpl_row_idempotency.result
index ccb7ce774e5..fcc68cd4712 100644
--- a/mysql-test/suite/rpl/r/rpl_row_idempotency.result
+++ b/mysql-test/suite/rpl/r/rpl_row_idempotency.result
@@ -46,7 +46,7 @@ a	b
 set global slave_exec_mode='IDEMPOTENT';
 set global slave_exec_mode='STRICT';
 set global slave_exec_mode='IDEMPOTENT,STRICT';
-ERROR HY000: Ambiguous slave modes combination. 
+ERROR 42000: Variable 'slave_exec_mode' can't be set to the value of 'IDEMPOTENT,STRICT'
 select @@global.slave_exec_mode /* must be STRICT */;
 @@global.slave_exec_mode
 STRICT
diff --git a/mysql-test/suite/rpl/t/rpl_row_idempotency.test b/mysql-test/suite/rpl/t/rpl_row_idempotency.test
index ef8853dc50f..cd62280f1d4 100644
--- a/mysql-test/suite/rpl/t/rpl_row_idempotency.test
+++ b/mysql-test/suite/rpl/t/rpl_row_idempotency.test
@@ -90,7 +90,7 @@ set global slave_exec_mode='IDEMPOTENT';
 set global slave_exec_mode='STRICT';
 
 # checking mutual exclusion for the options
---error ER_SLAVE_AMBIGOUS_EXEC_MODE
+--error ER_WRONG_VALUE_FOR_VAR
 set global slave_exec_mode='IDEMPOTENT,STRICT';
 
 select @@global.slave_exec_mode /* must be STRICT */;
diff --git a/mysql-test/suite/sys_vars/r/slave_type_conversions_basic.result b/mysql-test/suite/sys_vars/r/slave_type_conversions_basic.result
new file mode 100644
index 00000000000..722d1b39e4f
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/slave_type_conversions_basic.result
@@ -0,0 +1,26 @@
+set @saved_slave_type_conversions = @@global.slave_type_conversions;
+SELECT @@global.slave_type_conversions;
+@@global.slave_type_conversions
+
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='';
+SELECT @@global.slave_type_conversions;
+@@global.slave_type_conversions
+
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY';
+SELECT @@global.slave_type_conversions;
+@@global.slave_type_conversions
+ALL_NON_LOSSY
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY';
+SELECT @@global.slave_type_conversions;
+@@global.slave_type_conversions
+ALL_LOSSY
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY';
+SELECT @@global.slave_type_conversions;
+@@global.slave_type_conversions
+ALL_LOSSY,ALL_NON_LOSSY
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY,NONEXISTING_BIT';
+ERROR 42000: Variable 'slave_type_conversions' can't be set to the value of 'NONEXISTING_BIT'
+SELECT @@global.slave_type_conversions;
+@@global.slave_type_conversions
+ALL_LOSSY,ALL_NON_LOSSY
+set global slave_type_conversions = @saved_slave_type_conversions;
diff --git a/mysql-test/suite/sys_vars/t/slave_type_conversions_basic.test b/mysql-test/suite/sys_vars/t/slave_type_conversions_basic.test
new file mode 100644
index 00000000000..c46045b35f7
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/slave_type_conversions_basic.test
@@ -0,0 +1,22 @@
+
+set @saved_slave_type_conversions = @@global.slave_type_conversions;
+
+SELECT @@global.slave_type_conversions;
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='';
+SELECT @@global.slave_type_conversions;
+
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY';
+SELECT @@global.slave_type_conversions;
+
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY';
+SELECT @@global.slave_type_conversions;
+
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY';
+SELECT @@global.slave_type_conversions;
+
+# checking that setting variable to a non existing value raises error
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY,NONEXISTING_BIT';
+SELECT @@global.slave_type_conversions;
+
+set global slave_type_conversions = @saved_slave_type_conversions;