MDEV-30295 mysqldump produces syntactically incorrect statement

Remove version-specific executable comments, that were used for backward compatibility
with old MySQL versions (3.2, 4.0, 4.1, 5.0).

Author: forkfun

client/mysqladmin.cc

@@ -904,7 +904,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       void (*func) (MYSQL_RES*, MYSQL_ROW, uint);
 
       new_line = 1;
-      if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") ||
+      if (mysql_query(mysql, "show GLOBAL status") ||
 	  !(res = mysql_store_result(mysql)))
       {
 	my_printf_error(0, "unable to show status; error: '%s'", error_flags,

client/mysqlbinlog.cc

@@ -688,7 +688,7 @@ print_skip_replication_statement(PRINT_EVENT_INFO *pinfo, const Log_event *ev)
   cur_val= (ev->flags & LOG_EVENT_SKIP_REPLICATION_F) != 0;
   if (cur_val == pinfo->skip_replication)
     return;                                     /* Not changed. */
-  fprintf(result_file, "/*!50521 SET skip_replication=%d*/%s\n",
+  fprintf(result_file, "SET skip_replication=%d;%s\n",
           cur_val, pinfo->delimiter);
   pinfo->skip_replication= cur_val;
 }
@@ -3572,30 +3572,29 @@ int main(int argc, char** argv)
 
   if (!opt_raw_mode)
   {
-    fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;\n");
+    fprintf(result_file, "SET @@SESSION.PSEUDO_SLAVE_MODE=1;\n");
 
     fprintf(result_file,
-	    "/*!40019 SET @@session.max_delayed_threads=0*/;\n");
+	    "SET @@session.max_delayed_threads=0;\n");
 
     if (disable_log_bin)
       fprintf(result_file,
-              "/*!32316 SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0*/;\n");
+              "SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0;\n");
 
     /*
       In mysqlbinlog|mysql, don't want mysql to be disconnected after each
       transaction (which would be the case with GLOBAL.COMPLETION_TYPE==2).
     */
     fprintf(result_file,
-            "/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,"
-            "COMPLETION_TYPE=0*/;\n");
+            "SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,"
+            "COMPLETION_TYPE=0;\n");
 
     if (charset)
       fprintf(result_file,
-              "\n/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;"
-              "\n/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;"
-              "\n/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;"  
-              "\n/*!40101 SET NAMES %s */;\n", charset);
-  }
+              "\nSET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT;"
+              "\nSET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS;"
+              "\nSET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION;"
+              "\nSET NAMES %s;\n", charset);  }
 
   for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;
        (--argc >= 0) ; )
@@ -3659,16 +3658,16 @@ int main(int argc, char** argv)
     */
     fprintf(result_file,
             "# End of log file\nROLLBACK /* added by mysqlbinlog */;\n"
-            "/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;\n");
+            "SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE;\n");
     if (disable_log_bin)
-      fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");
+      fprintf(result_file, "SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN;\n");
 
     if (charset)
       fprintf(result_file,
-              "/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n"
-              "/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n"
-              "/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n");
-    fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;\n");
+              "SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT;\n"
+              "SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS;\n"
+              "SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION;\n");
+    fprintf(result_file, "SET @@SESSION.PSEUDO_SLAVE_MODE=0;\n");
 
     if (gtid_event_filter)
     {

client/mysqlcheck.c

@@ -672,7 +672,7 @@ static int process_all_tables_in_db(char *database)
 
   if (use_db(database))
     DBUG_RETURN(1);
-  if ((mysql_query(sock, "SHOW /*!50002 FULL*/ TABLES") &&
+  if ((mysql_query(sock, "SHOW FULL TABLES") &&
        mysql_query(sock, "SHOW TABLES")) ||
       !(res= mysql_store_result(sock)))
   {