Merge embedded-server testing changes.

1 files changed, 0 insertions, 2 deletions

diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 633f7c139fd..6d4f9055e4e 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -324,7 +324,6 @@ set read_buffer_size=100;
 set read_rnd_buffer_size=100;
 set global rpl_recovery_rank=100;
 set global server_id=100;
-set global slave_net_timeout=100;
 set global slow_launch_time=100;
 set sort_buffer_size=100;
 set sql_auto_is_null=1;
@@ -349,7 +348,6 @@ select @@sql_max_join_size,@@max_join_size;
 set sql_quote_show_create=1;
 set sql_safe_updates=1;
 set sql_select_limit=1;
-set global sql_slave_skip_counter=100;
 set sql_warnings=1;
 set global table_cache=100;
 set storage_engine=myisam;