Merge from WL#6735

Author: Akhila Maddukuri

README

@@ -5,7 +5,7 @@ For the avoidance of doubt, this particular copy of the software
 is released under the version 2 of the GNU General Public License. 
 MySQL is brought to you by Oracle.
 
-Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 

client/client_priv.h

@@ -98,6 +98,7 @@ enum options_client
   OPT_MYSQLBINLOG_EXCLUDE_GTIDS,
   OPT_REMOTE_PROTO,
   OPT_CONFIG_ALL,
+  OPT_REWRITE_DB,
   OPT_SERVER_PUBLIC_KEY,
   OPT_ENABLE_CLEARTEXT_PLUGIN,
   OPT_MAX_CLIENT_OPTION

client/mysql.cc

@@ -2624,14 +2624,17 @@ static bool add_line(String &buffer, char *line, ulong line_length,
   {
     uint length=(uint) (out-line);
 
-    if (!truncated && !is_delimiter_command(line, length))
+    if (!truncated && (!is_delimiter_command(line, length) ||
+                       (*in_string || *ml_comment)))
     {
       /* 
         Don't add a new line in case there's a DELIMITER command to be 
         added to the glob buffer (e.g. on processing a line like 
         "<command>;DELIMITER <non-eof>") : similar to how a new line is 
         not added in the case when the DELIMITER is the first command 
-        entered with an empty glob buffer. 
+        entered with an empty glob buffer. However, if the delimiter is
+        part of a string or a comment, the new line should be added. (e.g.
+        SELECT '\ndelimiter\n';\n)
       */
       *out++='\n';
       length++;

client/mysql_config_editor.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,14 +50,14 @@ static int g_fd;
 */
 static size_t file_size;
 static char *opt_user= NULL, *opt_password= NULL, *opt_host=NULL,
-            *opt_login_path= NULL;
+            *opt_login_path= NULL, *opt_socket= NULL, *opt_port= NULL;
 
 static char my_login_file[FN_REFLEN];
 static char my_key[LOGIN_KEY_LEN];
 
 static my_bool opt_verbose, opt_all, tty_password= 0, opt_warn,
                opt_remove_host, opt_remove_pass, opt_remove_user,
-               login_path_specified= FALSE;
+               opt_remove_socket, opt_remove_port, login_path_specified= FALSE;
 
 static int execute_commands(int command);
 static int set_command(void);
@@ -141,6 +141,10 @@ static struct my_option my_set_command_options[]=
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"user", 'u', "User name to be entered into the login file.", &opt_user,
    &opt_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"socket", 'S', "Socket path to be entered into login file.", &opt_socket,
+   &opt_socket, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"port", 'P', "Port number to be entered into login file.", &opt_port,
+   &opt_port, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"warn", 'w', "Warn and ask for confirmation if set command attempts to "
    "overwrite an existing login path (enabled by default).",
    &opt_warn, &opt_warn, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
@@ -157,8 +161,9 @@ static struct my_option my_remove_command_options[]=
    0, 0, 0},
   {"login-path", 'G', "Name of the login path from which options to "
    "be removed (entire path would be removed if none of user, password, "
-   "or host options are specified). (Default : client)", &opt_login_path,
-   &opt_login_path, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   "host, socket, or port options are specified). (Default : client)",
+   &opt_login_path, &opt_login_path, 0, GET_STR, REQUIRED_ARG,
+   0, 0, 0, 0, 0, 0},
   {"password", 'p', "Remove password from the login path.",
    &opt_remove_pass, &opt_remove_pass, 0, GET_BOOL, NO_ARG, 0, 0, 0,
    0, 0, 0},
@@ -168,6 +173,10 @@ static struct my_option my_remove_command_options[]=
    "to remove the default login path (client) if no login path is specified "
    "(enabled by default).", &opt_warn, &opt_warn, 0, GET_BOOL, NO_ARG, 1,
    0, 0, 0, 0, 0},
+  {"socket", 'S', "Remove socket path from the login path.", &opt_remove_socket,
+   &opt_remove_socket, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"port", 'P', "Remove port number from the login path.", &opt_remove_port,
+   &opt_remove_port, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -229,6 +238,13 @@ my_set_command_get_one_option(int optid,
     tty_password= 1;
     break;
   case 'G':
+    if (login_path_specified)
+    {
+      /* Error, we do not support multiple login paths. */
+      my_perror("Error: Use of multiple login paths is not supported. "
+                "Exiting..");
+      return 1;
+    }
     login_path_specified= TRUE;
     break;
   case '?':
@@ -246,6 +262,13 @@ my_remove_command_get_one_option(int optid,
 {
   switch(optid) {
   case 'G':
+    if (login_path_specified)
+    {
+      /* Error, we do not support multiple login paths. */
+      my_perror("Error: Use of multiple login paths is not supported. "
+                "Exiting..");
+      return 1;
+    }
     login_path_specified= TRUE;
     break;
   case '?':
@@ -263,6 +286,13 @@ my_print_command_get_one_option(int optid,
 {
   switch(optid) {
   case 'G':
+    if (login_path_specified)
+    {
+      /* Error, we do not support multiple login paths. */
+      my_perror("Error: Use of multiple login paths is not supported. "
+                "Exiting..");
+      return 1;
+    }
     login_path_specified= TRUE;
     break;
   case '?':
@@ -537,6 +567,18 @@ static int set_command(void)
     dynstr_append(&path_buf, opt_host);
   }
 
+  if (opt_socket)
+  {
+    dynstr_append(&path_buf, "\nsocket = ");
+    dynstr_append(&path_buf, opt_socket);
+  }
+
+  if (opt_port)
+  {
+    dynstr_append(&path_buf, "\nport = ");
+    dynstr_append(&path_buf, opt_port);
+  }
+
   dynstr_append(&path_buf, "\n");
 
   /* Warn if login path already exists */
@@ -901,7 +943,8 @@ static void mask_password_and_print(char *buf)
 static void remove_options(DYNAMIC_STRING *file_buf, const char *path_name)
 {
   /* If nope of the options are specified remove the entire path. */
-  if (!opt_remove_host && !opt_remove_pass && !opt_remove_user)
+  if (!opt_remove_host && !opt_remove_pass && !opt_remove_user 
+      && !opt_remove_socket && !opt_remove_port)
   {
     remove_login_path(file_buf, path_name);
     return;
@@ -915,6 +958,12 @@ static void remove_options(DYNAMIC_STRING *file_buf, const char *path_name)
 
   if (opt_remove_host)
     remove_option(file_buf, path_name, "host");
+
+  if (opt_remove_socket)
+    remove_option(file_buf, path_name, "socket");
+
+  if (opt_remove_port)
+    remove_option(file_buf, path_name, "port");
 }
 
 
@@ -1423,8 +1472,8 @@ static void usage_program(void)
   my_print_help(my_program_long_options);
   my_print_variables(my_program_long_options);
   puts("\nWhere command can be any one of the following :\n\
-       set [command options]     Sets user name/password/host name for a\n\
-                                 given login path (section).\n\
+       set [command options]     Sets user name/password/host name/socket/port\n\
+                                 for a given login path (section).\n\
        remove [command options]  Remove a login path from the login file.\n\
        print [command options]   Print all the options for a specified\n\
                                  login path.\n\

client/mysqlbinlog.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -65,6 +65,11 @@ using std::max;
 #define INTVAR_DYNAMIC_INIT	16
 #define INTVAR_DYNAMIC_INCR	1
 
+/*
+  The character set used should be equal to the one used in mysqld.cc for
+  server rewrite-db
+*/
+#define mysqld_charset &my_charset_latin1
 
 #define CLIENT_CAPABILITIES	(CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES)
 
@@ -119,6 +124,7 @@ static enum enum_remote_proto {
 static char *opt_remote_proto_str= 0;
 static char *database= 0;
 static char *output_file= 0;
+static char *rewrite= 0;
 static my_bool force_opt= 0, short_form= 0, idempotent_mode= 0;
 static my_bool debug_info_flag, debug_check_flag;
 static my_bool force_if_open_opt= 1, raw_mode= 0;
@@ -159,6 +165,18 @@ Checkable_rwlock *global_sid_lock= NULL;
 Gtid_set *gtid_set_included= NULL;
 Gtid_set *gtid_set_excluded= NULL;
 
+/**
+  Function to add a new member in the binlog_rewrite_db list
+  in the form of from_db, to_db pair
+
+  @param from_db    database to be rewritten.
+  @param to_db      new database name to replace from_db.
+ */
+void add_binlog_db_rewrite(const char* from_db, const char* to_db)
+{
+  i_string_pair *db_pair = new i_string_pair(from_db, to_db);
+  binlog_rewrite_db.push_back(db_pair);
+}
 
 /**
   Pointer to the Format_description_log_event of the currently active binlog.
@@ -1134,10 +1152,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
            event was not skipped).
         */
         if (skip_event)
-          /* Flush head,body and footer cache to result_file */
-          if ((copy_event_cache_to_file_and_reinit(&print_event_info->head_cache, result_file) ||
-              copy_event_cache_to_file_and_reinit(&print_event_info->body_cache, result_file)  ||
-              copy_event_cache_to_file_and_reinit(&print_event_info->footer_cache, result_file)))
+          if ((copy_event_cache_to_file_and_reinit(&print_event_info->head_cache,
+                                                   result_file, stop_never /* flush result_file */) ||
+              copy_event_cache_to_file_and_reinit(&print_event_info->body_cache,
+                                                  result_file, stop_never /* flush result_file */) ||
+              copy_event_cache_to_file_and_reinit(&print_event_info->footer_cache,
+                                                  result_file, stop_never /* flush result_file */)))
             goto err;
       }
 
@@ -1179,9 +1199,12 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
       if (stmt_end)
       {
         print_event_info->have_unflushed_events= FALSE;
-        if (copy_event_cache_to_file_and_reinit(&print_event_info->head_cache, result_file) ||
-            copy_event_cache_to_file_and_reinit(&print_event_info->body_cache, result_file) ||
-            copy_event_cache_to_file_and_reinit(&print_event_info->footer_cache, result_file))
+        if (copy_event_cache_to_file_and_reinit(&print_event_info->head_cache,
+                                                result_file, stop_never /* flush result file */) ||
+            copy_event_cache_to_file_and_reinit(&print_event_info->body_cache,
+                                                result_file, stop_never /* flush result file */) ||
+            copy_event_cache_to_file_and_reinit(&print_event_info->footer_cache,
+                                                result_file, stop_never /* flush result file */))
           goto err;
         goto end;
       }
@@ -1221,7 +1244,7 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
     }
     /* Flush head cache to result_file for every event */
     if (copy_event_cache_to_file_and_reinit(&print_event_info->head_cache,
-                                            result_file))
+                                            result_file, stop_never /* flush result_file */))
       goto err;
   }
 
@@ -1276,6 +1299,9 @@ static struct my_option my_long_options[] =
   {"database", 'd', "List entries for just this database (local log only).",
    &database, &database, 0, GET_STR_ALLOC, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
+  {"rewrite-db", OPT_REWRITE_DB, "Rewrite the row event to point so that "
+   "it can be applied to a new database", &rewrite, &rewrite, 0,
+   GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef DBUG_OFF
   {"debug", '#', "Output debug log.", &default_dbug_option,
    &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
@@ -1611,6 +1637,35 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   case 'd':
     one_database = 1;
     break;
+  case OPT_REWRITE_DB:
+  {
+    char *from_db= argument, *p, *to_db;
+    if (!(p= strstr(argument, "->")))
+    {
+      sql_print_error("Bad syntax in mysqlbinlog-rewrite-db - missing '->'!\n");
+      return 1;
+    }
+    to_db= p + 2;
+    while(p > argument && my_isspace(mysqld_charset, p[-1]))
+      p--;
+    *p= 0;
+    if (!*from_db)
+    {
+      sql_print_error("Bad syntax in mysqlbinlog-rewrite-db - empty FROM db!\n");
+      return 1;
+    }
+    while (*to_db && my_isspace(mysqld_charset, *to_db))
+      to_db++;
+    if (!*to_db)
+    {
+      sql_print_error("Bad syntax in mysqlbinlog-rewrite-db - empty TO db!\n");
+      return 1;
+    }
+    option_rewrite_set= TRUE;
+    add_binlog_db_rewrite(from_db, to_db); //add the new from_db, to_db pair in
+                                           // I_List ie. binlog_rewrite_db.
+    break;
+  }
   case 'p':
     if (argument == disabled_my_option)
       argument= (char*) "";                     // Don't require password
@@ -2055,6 +2110,21 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
     */
 
     type= (Log_event_type) net->read_pos[1 + EVENT_TYPE_OFFSET];
+
+    /*
+      Ignore HEARBEAT events. They can show up if mysqlbinlog is
+      running with:
+
+        --read-from-remote-server
+        --read-from-remote-master=BINLOG-DUMP-GTIDS'
+        --stop-never
+        --stop-never-slave-server-id
+
+      i.e., acting as a fake slave.
+    */
+    if (type == HEARTBEAT_LOG_EVENT)
+      continue;
+
     if (!raw_mode || (type == ROTATE_EVENT) || (type == FORMAT_DESCRIPTION_EVENT))
     {
       if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,