log_event.cc:

  After merge fix


sql/log_event.cc:
  After merge fix

sql/log_event.cc

@@ -1642,7 +1642,8 @@ void Query_log_event::print_query_header(FILE* file,
   }
   if (lc_time_names_number != print_event_info->lc_time_names_number)
   {
-    fprintf(file, "SET @@session.lc_time_names=%d;\n", lc_time_names_number);
+    fprintf(file, "SET @@session.lc_time_names=%d%s\n",
+            lc_time_names_number, print_event_info->delimiter);
     print_event_info->lc_time_names_number= lc_time_names_number;
   }
 }