diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9129cf584f9..cd87b097038 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1975,16 +1975,11 @@ mysql_execute_command(THD *thd)
     /*
       Skip if we are in the slave thread, some table rules have been
       given and the table list says the query should not be replicated.
-
-      Exceptions are:
-
-      - SET: we always execute it (e.g., SET ONE_SHOT TIME_ZONE = 'XYZ')
-
-      - DROP TEMPORARY TABLE IF EXISTS: we always execute it (otherwise we
-        have stale files on slave caused by exclusion of one tmp table).
+      Exception is DROP TEMPORARY TABLE IF EXISTS: we always execute it
+      (otherwise we have stale files on slave caused by exclusion of one tmp
+      table).
     */
-    if (lex->sql_command != SQLCOM_SET_OPTION &&
-        !(lex->sql_command == SQLCOM_DROP_TABLE &&
+    if (!(lex->sql_command == SQLCOM_DROP_TABLE &&
           lex->drop_temporary && lex->drop_if_exists) &&
         all_tables_not_ok(thd,tables))
     {