Merge branch 'mdev7818-4' into bb-10.1-knielsen

Conflicts:
	sql/sql_parse.cc

Author: knielsen

sql/sql_parse.cc

@@ -4811,6 +4811,7 @@ mysql_execute_command(THD *thd)
     }
 #endif /* WITH_WSREP*/
 
+#ifdef HAVE_REPLICATION
     if (lex->type & REFRESH_READ_LOCK)
     {
       /*
@@ -4822,6 +4823,7 @@ mysql_execute_command(THD *thd)
       if (rpl_pause_for_ftwrl(thd))
         goto error;
     }
+#endif
     /*
       reload_acl_and_cache() will tell us if we are allowed to write to the
       binlog or not.
@@ -4852,8 +4854,10 @@ mysql_execute_command(THD *thd)
       if (!res)
         my_ok(thd);
     } 
+#ifdef HAVE_REPLICATION
     if (lex->type & REFRESH_READ_LOCK)
       rpl_unpause_after_ftwrl(thd);
+#endif
 
     break;
   }