Merge lp:~vlad-lesin/percona-server/5.6-mysqlbinlog-replacedb into lp:percona-server/5.6

[Vlad Lesin]

Merged from 5.5.

Port --rewrite-db mysqlbinlog option from 5.1.

--rewrite-db is a string option which allows to replace one db-name to another
in mysqlbinlog output. The format of the string value is the following:
"from1->to1,from2->to2,from3->to3". Where "to[123]" are the names to which
the correspondent "from[123]" names must be replaced.

The original implementation does not replace db names in statements for
statement-based binlog, it just replaces db name of binlog event and issues
"USE" statement with replaced db name if necessary. I think this restriction
concerned with unwillingness to implement complex logic for parsing db names
from statements for such simple feature.

But for row-based binlog it replaces db names in statements correctly because
each table name is mapped to some number in binlog and it is quite easy to
extract such table ids from binlog event and replace one name by another.

http://jenkins.percona.com/job/percona-server-5.6-param/408/

The following changes are between 5.5 and 5.6:
1) Define "CHARSET_INFO* table_alias_charset= &my_charset_utf8_general_ci;" in 5.6 instead of "CHARSET_INFO* system_charset_info= &my_charset_utf8_general_ci;" in 5.5. There is no need to define system_charset_info in 5.6 to link mysqlbinlog with rpl_filter.o, but table_alias_charset is necessary.

2) process_event() differs because the original code differs too.

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Stewart Smith (stewart)]

It states that you can do "a->b,c->d" but I don't see the handling for the comma in the mysqlbinlog.cc command line parsing. Am I missing something? We should also test this.

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

See 5.5 comments.

review: Needs Fixing

[Vlad Lesin (vlad-lesin)]

> See 5.5 comments.
Fixed, http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/467/.

Also there is a memory leak in mysql-5.7.3 when --rewrite-db option is used. Here is the bug report http://bugs.mysql.com/bug.php?id=71283 .

[Vlad Lesin (vlad-lesin)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/477

[Vlad Lesin (vlad-lesin)]

See 5.5 comments.

http://jenkins.percona.com/view/PS 5.6/job/percona-server-5.6-param/499

[Laurynas Biveinis (laurynas-biveinis)]

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'client/CMakeLists.txt'
--- client/CMakeLists.txt	2013-10-08 06:03:07 +0000
+++ client/CMakeLists.txt	2014-02-15 00:30:14 +0000
@@ -61,7 +61,8 @@
 MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
 TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
 
-MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc)
+MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
+                     ../sql/rpl_filter.cc ../sql/sql_list.cc)
 TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
 
 MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)

=== modified file 'client/client_priv.h'
--- client/client_priv.h	2013-06-25 13:13:06 +0000
+++ client/client_priv.h	2014-02-15 00:30:14 +0000
@@ -104,6 +104,7 @@
   OPT_SERVER_PUBLIC_KEY,
   OPT_ENABLE_CLEARTEXT_PLUGIN,
   OPT_INNODB_OPTIMIZE_KEYS,
+  OPT_REWRITE_DB,
   OPT_MAX_CLIENT_OPTION
 };
 

=== modified file 'client/mysqlbinlog.cc'
--- client/mysqlbinlog.cc	2013-10-31 18:42:25 +0000
+++ client/mysqlbinlog.cc	2014-02-15 00:30:14 +0000
@@ -60,6 +60,18 @@
 using std::min;
 using std::max;
 
+/* Needed for Rpl_filter */
+CHARSET_INFO *table_alias_charset= &my_charset_bin;
+
+#include "rpl_filter.h"
+
+/*
+ True if obsolette syntax warning has been already shown
+ during parsing --rewrite-db command line option
+*/
+bool rewrite_db_obs_syn_warn= false;
+Rpl_filter *binlog_filter= NULL;
+
 #define BIN_LOG_HEADER_SIZE	4U
 #define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)
 #define INTVAR_DYNAMIC_INIT	16
@@ -712,6 +724,35 @@
          strcmp(log_dbname, database);
 }
 
+/**
+  Rewrites db name in T instance if binlog_filter contains
+  name for replacement(see --rewrite-db option).
+
+  T::db must be weak pointer and can point to the memory owned by
+  "binlog_filter" after this function execution, that is why "ev" must be
+  destroyed before "binlog_filter".
+
+  @param ev Event to process
+*/
+template <typename T>
+static void rewrite_db(T &ev)
+{
+  size_t      len_to= 0;
+  const char* db_to;
+
+  DBUG_ASSERT(binlog_filter);
+
+  if (!ev.db)
+    return;
+
+  db_to=  binlog_filter->get_rewrite_db(ev.db, &len_to);
+
+  if (!len_to)
+    return;
+
+  ev.db= db_to;
+  ev.db_len= len_to;
+}
 
 /**
   Checks whether the given event should be filtered out,
@@ -898,6 +939,13 @@
     switch (ev_type) {
     case QUERY_EVENT:
     {
+      /*
+        ev is deleted at the end of this function(before binlog_filter deletion)
+        so it is safe to set ev->db to some memory owned by binlog_filter here.
+      */
+      if (binlog_filter)
+        rewrite_db(*static_cast<Query_log_event *>(ev));
+
       bool parent_query_skips=
           !((Query_log_event*) ev)->is_trans_keyword() &&
            shall_skip_database(((Query_log_event*) ev)->db);
@@ -989,6 +1037,12 @@
     {
       Create_file_log_event* ce= (Create_file_log_event*)ev;
       /*
+        ev is deleted at the end of this function(before binlog_filter deletion)
+        so it is safe to set ev->db to some memory owned by binlog_filter here.
+      */
+      if (binlog_filter)
+        rewrite_db(*ce);
+      /*
         We test if this event has to be ignored. If yes, we don't save
         this event; this will have the good side-effect of ignoring all
         related Append_block and Exec_load.
@@ -1115,6 +1169,12 @@
     case EXECUTE_LOAD_QUERY_EVENT:
     {
       Execute_load_query_log_event *exlq= (Execute_load_query_log_event*)ev;
+      /*
+        ev is deleted at the end of this function(before binlog_filter deletion)
+        so it is safe to set ev->db to some memory owned by binlog_filter here.
+      */
+      if (binlog_filter)
+        rewrite_db(*exlq);
       char *fname= load_processor.grab_fname(exlq->file_id);
 
       if (shall_skip_database(exlq->db))
@@ -1144,6 +1204,19 @@
     case TABLE_MAP_EVENT:
     {
       Table_map_log_event *map= ((Table_map_log_event *)ev);
+      // Rewrite db name here (see --rewrite-db option)
+      if (binlog_filter)
+      {
+        size_t      len_to= 0;
+        const char* db_to=  binlog_filter->get_rewrite_db(map->get_db_name(),
+                                                          &len_to);
+        if (len_to && map->rewrite_db(db_to, len_to, glob_description_event))
+        {
+          error("Could not rewrite database name");
+          goto err;
+        }
+      }
+
       if (shall_skip_database(map->get_db_name()))
       {
         print_event_info->skipped_event_in_transaction= true;
@@ -1589,6 +1662,10 @@
    "Identifiers were provided.",
    &opt_exclude_gtids_str, &opt_exclude_gtids_str, 0,
    GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"rewrite-db", OPT_REWRITE_DB,
+   "Updates to a database with a different name than the original. "
+   "Example: rewrite-db='from->to'.",
+   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -1674,6 +1751,7 @@
   delete_dynamic(&buff_ev);
   
   delete glob_description_event;
+  delete binlog_filter;
   if (mysql)
     mysql_close(mysql);
 }
@@ -1773,6 +1851,88 @@
     opt_base64_output_mode= (enum_base64_output_mode)
       (find_type_or_exit(argument, &base64_output_mode_typelib, opt->name)-1);
     break;
+  case OPT_REWRITE_DB:    // db_from->db_to
+  {
+    /* See also handling of OPT_REPLICATE_REWRITE_DB in sql/mysqld.cc */
+    char* ptr= argument;
+    do {
+      char* key= ptr;                         // db-from
+      char* val;                                   // db-to
+
+      // Where key begins
+      while (*key && my_isspace(&my_charset_latin1, *key))
+        key++;
+
+      // Where val begins
+      if (!(ptr= strstr(key, "->")))
+      {
+        sql_print_error("Bad syntax in rewrite-db: missing '->'!\n");
+        return 1;
+      }
+      val= ptr + 2;
+      while (*val && my_isspace(&my_charset_latin1, *val))
+        val++;
+
+      // Write \0 and skip blanks at the end of key
+      *ptr-- = 0;
+      while (my_isspace(&my_charset_latin1, *ptr) && ptr > argument)
+        *ptr-- = 0;
+
+      if (!*key)
+      {
+        sql_print_error("Bad syntax in rewrite-db: empty db-from!\n");
+        return 1;
+      }
+
+      // Skip blanks at the end of val
+      ptr= val;
+      while (*ptr && !my_isspace(&my_charset_latin1, *ptr) && *ptr != ',')
+        ++ptr;
+
+      if (my_isspace(&my_charset_latin1, *ptr))
+      {
+        *(ptr++)= 0;
+        while (*ptr && *ptr != ',')
+	{
+          if (!my_isspace(&my_charset_latin1, *ptr)) {
+            sql_print_error("Bad syntax in rewrite-db: db-to must contain db "
+			    "name without spaces!\n");
+            return 1;
+	  }
+          ++ptr;
+	}
+      }
+
+      if (*ptr == ',')
+      {
+	if (!rewrite_db_obs_syn_warn)
+	{
+	  warning("The comma-separated list of rewritings syntax is obsolete and "
+	          "discarded in 5.7\n");
+	  rewrite_db_obs_syn_warn= true;
+	}
+        *(ptr++)= 0;
+      }
+      else
+	*ptr= 0;
+
+      if (!*val)
+      {
+        sql_print_error("Bad syntax in rewrite-db: empty db-to!\n");
+        return 1;
+      }
+
+      if (!binlog_filter &&
+          !(binlog_filter= new Rpl_filter))
+      {
+        sql_print_error("Failed to create Rpl_filter\n");
+        return 1;
+      }
+
+      binlog_filter->add_db_rewrite(key, val);
+    } while (*ptr);
+    break;
+  }
   case 'v':
     if (argument == disabled_my_option)
       verbose= 0;

=== added file 'mysql-test/extra/rpl_tests/grep_pattern.inc'
--- mysql-test/extra/rpl_tests/grep_pattern.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/extra/rpl_tests/grep_pattern.inc	2014-02-15 00:30:14 +0000
@@ -0,0 +1,22 @@
+# Please set GREP_FILE and GREP_PATTERN environment variables 
+#  to work this file properly.
+--perl
+  use strict;
+  my $file= $ENV{'GREP_FILE'} or die "grep file not set";
+  my $pattern= $ENV{'GREP_PATTERN'} or die "pattern is not set";
+  open(FILE, "$file") or die("Unable to open $file: $!\n");
+  my $count = 0;
+  print "Matching lines are:\n";
+  while (<FILE>) {
+    my $line = $_;
+    if ($line =~ /$pattern/) {
+      print "$line\n";
+      $count++;
+    }
+  }
+  if ($count == 0) {
+    print "None\n";
+  }
+  print "Occurrences of the $pattern in the input file : $count\n";
+  close(FILE);
+EOF

=== added file 'mysql-test/suite/binlog/r/binlog_mysqlbinlog_rewrite_db.result'
--- mysql-test/suite/binlog/r/binlog_mysqlbinlog_rewrite_db.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/binlog_mysqlbinlog_rewrite_db.result	2014-02-15 00:30:14 +0000
@@ -0,0 +1,33 @@
+RESET MASTER;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INT);
+INSERT INTO t1 VALUES(1);
+INSERT INTO t1 VALUES(2);
+UPDATE t1 SET i= i+1;
+DELETE FROM t1 WHERE i=2;
+[Syntax error in the use of the new option: The from database name is missing]
+[Syntax error in the use of the new option: The '->' is missing]
+[Syntax error in the use of the new option: The to database name is missing]
+[VALID SYNTAX,The from->to database names are correctly mentioned, but there is obsolete syntax warning 1]
+[Test that warning about obsolete syntax is shown only once for --rewrite-db="db1->db2,db3->db4,db5->db6"]
+[log_grep.inc] file: mysqltest.log pattern: The comma-separated list of rewritings syntax is obsolete and discarded
+[log_grep.inc] lines:   1
+[VALID SYNTAX,The from->to database names are correctly mentioned, but there is obsolete syntax warning 2]
+[Test that warning about obsolete syntax is shown only once for --rewrite-db="db1->db2,db3->db4" --rewrite-db="db5->db6,db6->db7"]
+[log_grep.inc] file: mysqltest.log pattern: The comma-separated list of rewritings syntax is obsolete and discarded
+[log_grep.inc] lines:   2
+[VALID SYNTAX,The from->to database names are correctly mentioned]
+#Dropping the database db1 and creating the table in the new database db2.
+CREATE DATABASE db2;
+DROP DATABASE db1;
+RESET MASTER;
+SELECT * FROM db2.t1;
+ERROR 42S02: Table 'db2.t1' doesn't exist
+DROP DATABASE db1;
+RESET MASTER;
+[The event of table db1.t1 has been successfully applied to db2.t1]
+include/assert.inc [Assert that table db2.t1 has one row after applying the sql file.]
+CLEANUP
+DROP DATABASE db1;
+DROP DATABASE db2;

=== added file 'mysql-test/suite/binlog/r/binlog_rewrite_db_noleak.result'
--- mysql-test/suite/binlog/r/binlog_rewrite_db_noleak.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/binlog_rewrite_db_noleak.result	2014-02-15 00:30:14 +0000
@@ -0,0 +1,29 @@
+RESET MASTER;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INT);
+INSERT INTO db1.t1 VALUES(1);
+INSERT INTO db1.t1 VALUES(2);
+UPDATE t1 SET i= i+1;
+DELETE FROM t1 WHERE i=2;
+CREATE DATABASE db2;
+CREATE TABLE db2.t1 (i INT);
+INSERT INTO db2.t1 VALUES(3);
+INSERT INTO db2.t1 VALUES(4);
+INSERT INTO db2.t1 VALUES(5);
+UPDATE db2.t1 SET i= i+1;
+DELETE FROM db2.t1 WHERE i=4;
+call mtr.add_suppression("Slave SQL: Error executing row event:*");
+Dropping the database db1 creating the new database db3.
+DROP DATABASE db1;
+CREATE DATABASE db3;
+DROP DATABASE db2;
+RESET MASTER;
+[The sql file will be applied on the current database]
+[The content of table db3.t1 and db2.t1 will be different confirming no leak]
+include/assert.inc [The content of the table t1 in database db3 and db2 is different]
+include/assert.inc [Table t1 in db3 have different row count than t1 in db2]
+CLEANUP
+DROP DATABASE db1;
+DROP DATABASE db2;
+DROP DATABASE db3;

=== added file 'mysql-test/suite/binlog/r/binlog_rewrite_suppress_use.result'
--- mysql-test/suite/binlog/r/binlog_rewrite_suppress_use.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/binlog_rewrite_suppress_use.result	2014-02-15 00:30:14 +0000
@@ -0,0 +1,29 @@
+RESET MASTER;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INT);
+INSERT INTO t1 VALUES(1);
+INSERT INTO t1 VALUES(2);
+UPDATE t1 SET i= i+1;
+DELETE FROM t1 WHERE i=2;
+[The use <db_name> is not suppressed in the general use of mysqlbinlog]
+Matching lines are:
+use `db1`/*!*/;
+
+Occurrences of the use `db1` in the input file : 1
+[The use <db_name> is suppressed on using rewrite-db option of mysqlbinlog]
+Matching lines are:
+None
+Occurrences of the use `db1` in the input file : 0
+CREATE DATABASE db2;
+DROP DATABASE db1;
+RESET MASTER;
+SELECT * FROM db2.t1;
+ERROR 42S02: Table 'db2.t1' doesn't exist
+DROP DATABASE db1;
+RESET MASTER;
+[The event of table db1.t1 has been successfully applied to db2.t1]
+include/assert.inc [Assert that table db2.t1 has no rows after applying the sql file.]
+[CLEANUP]
+DROP DATABASE db1;
+DROP DATABASE db2;

=== added file 'mysql-test/suite/binlog/r/percona_mysqlbinlog_rewritedb.result'
--- mysql-test/suite/binlog/r/percona_mysqlbinlog_rewritedb.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/percona_mysqlbinlog_rewritedb.result	2014-02-15 00:30:14 +0000
@@ -0,0 +1,152 @@
+#
+# Apply log with ''
+#
+# use a
+f
+0
+0
+# use bbbbbbbbbbbbbbbbbbbb
+f
+1
+1
+# use cccccccccccccccc
+f
+2
+2
+# use d
+f
+#
+# Apply log with '--rewrite-db="a->bbbbbbbbbbbbbbbbbbbb" --rewrite-db="cccccccccccccccc->d" --database="d"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+# use cccccccccccccccc
+f
+# use d
+f
+2
+2
+#
+# Apply log with '--rewrite-db="a->bbbbbbbbbbbbbbbbbbbb" --rewrite-db="cccccccccccccccc->d" --database="cccccccccccccccc"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+# use cccccccccccccccc
+f
+# use d
+f
+#
+# Apply log with '--rewrite-db="a->bbbbbbbbbbbbbbbbbbbb" --rewrite-db="cccccccccccccccc->d" --database="bbbbbbbbbbbbbbbbbbbb"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+0
+0
+1
+1
+# use cccccccccccccccc
+f
+# use d
+f
+#
+# Apply log with '--rewrite-db="a->bbbbbbbbbbbbbbbbbbbb" --rewrite-db="cccccccccccccccc->d" --database="a"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+# use cccccccccccccccc
+f
+# use d
+f
+#
+# Apply log with '--rewrite-db="a->bbbbbbbbbbbbbbbbbbbb" --rewrite-db="cccccccccccccccc->d"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+0
+0
+1
+1
+# use cccccccccccccccc
+f
+# use d
+f
+2
+2
+#
+# Apply log with '--rewrite-db="  a  -> bbbbbbbbbbbbbbbbbbbb , cccccccccccccccc ->   d  "'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+0
+0
+1
+1
+# use cccccccccccccccc
+f
+# use d
+f
+2
+2
+#
+# Apply log with '--rewrite-db="a->bbbbbbbbbbbbbbbbbbbb,cccccccccccccccc->d"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+0
+0
+1
+1
+# use cccccccccccccccc
+f
+# use d
+f
+2
+2
+#
+# Apply log with '--rewrite-db="a->d"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+1
+1
+# use cccccccccccccccc
+f
+2
+2
+# use d
+f
+0
+0
+#
+# Apply log with '--rewrite-db="a->bbbbbbbbbbbbbbbbbbbb"'
+#
+# use a
+f
+# use bbbbbbbbbbbbbbbbbbbb
+f
+0
+0
+1
+1
+# use cccccccccccccccc
+f
+2
+2
+# use d
+f

=== added file 'mysql-test/suite/binlog/t/binlog_mysqlbinlog_rewrite_db.test'
--- mysql-test/suite/binlog/t/binlog_mysqlbinlog_rewrite_db.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_mysqlbinlog_rewrite_db.test	2014-02-15 00:30:14 +0000
@@ -0,0 +1,95 @@
+# WL#6404 - Add rewrite-db option to mysqlbinlog on RBR
+#
+# The test checks the new rewrite-db option for the mysqlbinlog.
+#
+# The test checks the following aspects of the new option:
+
+# 1. The valid syntax for the use of the new option and the errors in
+#    case the usage is not correct.
+# 2. Apply the new binlog file ( with database rewritten ) to a new database
+#    and check if it works.
+#
+--source include/have_binlog_format_row.inc
+
+RESET MASTER;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INT);
+
+# Get some INSERT, UPDATE and DELETE ROW events.
+INSERT INTO t1 VALUES(1);
+INSERT INTO t1 VALUES(2);
+UPDATE t1 SET i= i+1;
+DELETE FROM t1 WHERE i=2;
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+--exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event.sql
+
+# Using the new option to apply the row event on some other database (from db1 -> db2 in the current case)
+
+--echo [Syntax error in the use of the new option: The from database name is missing]
+--error 1
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="->db2" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+
+--echo [Syntax error in the use of the new option: The '->' is missing]
+--error 1
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="db1 db2" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+
+--echo [Syntax error in the use of the new option: The to database name is missing]
+--error 1
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="db1->" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+
+--echo [VALID SYNTAX,The from->to database names are correctly mentioned, but there is obsolete syntax warning 1]
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="db1->db2,db3->db4,db5->db6" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+
+--echo [Test that warning about obsolete syntax is shown only once for --rewrite-db="db1->db2,db3->db4,db5->db6"]
+--let log_file=mysqltest.log
+--let log_file_full_path=$MYSQLTEST_VARDIR/log/current_test
+--let grep_pattern=The comma-separated list of rewritings syntax is obsolete and discarded
+--source include/log_grep.inc
+
+--echo [VALID SYNTAX,The from->to database names are correctly mentioned, but there is obsolete syntax warning 2]
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="db1->db2,db3->db4" --rewrite-db="db5->db6,db6->db7" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+
+--echo [Test that warning about obsolete syntax is shown only once for --rewrite-db="db1->db2,db3->db4" --rewrite-db="db5->db6,db6->db7"]
+--let log_file=mysqltest.log
+--let log_file_full_path=$MYSQLTEST_VARDIR/log/current_test
+--let grep_pattern=The comma-separated list of rewritings syntax is obsolete and discarded
+--source include/log_grep.inc
+
+--echo [VALID SYNTAX,The from->to database names are correctly mentioned]
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="db1->db2" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+
+--echo #Dropping the database db1 and creating the table in the new database db2.
+
+CREATE DATABASE db2;
+DROP DATABASE db1;
+
+# The SQL file will be applied but nothing is applied on Database db2 since the row event was
+# generated for database db1 and table t1.
+
+# With gtid-mode=on we need purge gtid_executed, if not transactions
+# replayed through mysqlbinlog will be skipped.
+RESET MASTER;
+--exec $MYSQL --database=db2 --local-infile=1 < $MYSQLTEST_VARDIR/tmp/row_event.sql
+--error ER_NO_SUCH_TABLE
+SELECT * FROM db2.t1;
+
+# The SQL file should be applied since the row event was extracted using the new mysqlbinlog option.
+
+DROP DATABASE db1;
+# With gtid-mode=on we need purge gtid_executed, if not transactions
+# replayed through mysqlbinlog will be skipped.
+RESET MASTER;
+--echo [The event of table db1.t1 has been successfully applied to db2.t1]
+--exec $MYSQL  --database=db2 --local-infile=1 < $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+--let $assert_text= Assert that table db2.t1 has one row after applying the sql file.
+--let $assert_cond= `SELECT COUNT(*)=1 from db2.t1`
+--source include/assert.inc
+
+--echo CLEANUP
+
+--remove_file $MYSQLTEST_VARDIR/tmp/row_event.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+DROP DATABASE db1;
+DROP DATABASE db2;

=== added file 'mysql-test/suite/binlog/t/binlog_rewrite_db_noleak.test'
--- mysql-test/suite/binlog/t/binlog_rewrite_db_noleak.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_rewrite_db_noleak.test	2014-02-15 00:30:14 +0000
@@ -0,0 +1,79 @@
+# WL#6404 - Add rewrite-db option to mysqlbinlog on RBR
+#
+# The test checks that there is no leak of the global variables used
+# to decide whether rewrite-db option is ON or OFF.
+#
+# The test checks this by creating two tables in two different databases.
+# insert rows in both of them.
+#
+# Read the binlog file using the new option --rewrite-db="db1->db3" and
+# writing in the .sql file.
+#
+# On applying the .sql file on database db3, we get an error since not
+# all events are converted for database db3. Only DB1 is converted to db3.
+# The db2 event cause the error.
+#
+
+--source include/have_binlog_format_row.inc
+RESET MASTER;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INT);
+
+# Get some INSERT, UPDATE and DELETE ROW events.
+INSERT INTO db1.t1 VALUES(1);
+INSERT INTO db1.t1 VALUES(2);
+UPDATE t1 SET i= i+1;
+DELETE FROM t1 WHERE i=2;
+
+CREATE DATABASE db2;
+CREATE TABLE db2.t1 (i INT);
+
+# Get some INSERT, UPDATE and DELETE ROW events.
+INSERT INTO db2.t1 VALUES(3);
+INSERT INTO db2.t1 VALUES(4);
+INSERT INTO db2.t1 VALUES(5);
+UPDATE db2.t1 SET i= i+1;
+DELETE FROM db2.t1 WHERE i=4;
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+
+# Using the new option to apply the row event on some other database (from db1 -> db3 in the current case)
+
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="db1->db3" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/rewrite_noleak.sql
+call mtr.add_suppression("Slave SQL: Error executing row event:*");
+
+--echo Dropping the database db1 creating the new database db3.
+DROP DATABASE db1;
+CREATE DATABASE db3;
+
+# The SQL file will be applied but only db1 events will be replayed on db3.
+# Database db2 will not be applied on db3 confirming there is no leak.
+DROP DATABASE db2;
+
+# With gtid-mode=on we need purge gtid_executed, if not transactions
+# replayed through mysqlbinlog will be skipped.
+RESET MASTER;
+--echo [The sql file will be applied on the current database]
+--exec $MYSQL --database=db3 --local-infile=1 < $MYSQLTEST_VARDIR/tmp/rewrite_noleak.sql
+
+--echo [The content of table db3.t1 and db2.t1 will be different confirming no leak]
+
+--let $db3_max= `SELECT MAX(i) FROM db3.t1`
+--let $db2_max= `SELECT MAX(i) FROM db2.t1`
+--let $assert_text= The content of the table t1 in database db3 and db2 is different
+--let $assert_cond= $db3_max <> $db2_max
+--source include/assert.inc
+
+--let $db3_count= `SELECT COUNT(*) FROM db3.t1`
+--let $db2_count= `SELECT COUNT(*) FROM db2.t1`
+--let $assert_text= Table t1 in db3 have different row count than t1 in db2
+--let $assert_cond= $db3_count=1 AND $db2_count<>1
+--source include/assert.inc
+
+--echo CLEANUP
+
+#--remove_file $MYSQLTEST_VARDIR/tmp/rewrite_noleak.sql
+DROP DATABASE db1;
+DROP DATABASE db2;
+DROP DATABASE db3;

=== added file 'mysql-test/suite/binlog/t/binlog_rewrite_suppress_use.test'
--- mysql-test/suite/binlog/t/binlog_rewrite_suppress_use.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_rewrite_suppress_use.test	2014-02-15 00:30:14 +0000
@@ -0,0 +1,61 @@
+# WL#6404 - Add rewrite-db option to mysqlbinlog on RBR
+#
+# The test aims to check that the use of rewrite-db option of
+# mysqlbinlog suppresses the USE DATABASE command logged in
+# binlog file.
+#
+
+--source include/have_binlog_format_row.inc
+RESET MASTER;
+CREATE DATABASE db1;
+USE db1;
+CREATE TABLE t1 (i INT);
+
+# Get some INSERT, UPDATE and DELETE ROW events.
+INSERT INTO t1 VALUES(1);
+INSERT INTO t1 VALUES(2);
+UPDATE t1 SET i= i+1;
+DELETE FROM t1 WHERE i=2;
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+
+# Checking for the suppression of the USE DATABASE command on using the new option.
+# Reading binlog file without the rewrite-db option.
+--echo [The use <db_name> is not suppressed in the general use of mysqlbinlog]
+--exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event.sql
+--let GREP_FILE=$MYSQLTEST_VARDIR/tmp/row_event.sql
+--let GREP_PATTERN=use `db1`
+--source extra/rpl_tests/grep_pattern.inc
+
+# Reading binlog file with the rewrite-db option.
+--echo [The use <db_name> is suppressed on using rewrite-db option of mysqlbinlog]
+--exec $MYSQL_BINLOG --force-if-open --rewrite-db="db1->db2" $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+--let GREP_FILE=$MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+--let GREP_PATTERN=use `db1`
+--source extra/rpl_tests/grep_pattern.inc
+
+CREATE DATABASE db2;
+DROP DATABASE db1;
+# With gtid-mode=on we need purge gtid_executed, if not transactions
+# replayed through mysqlbinlog will be skipped.
+RESET MASTER;
+--exec $MYSQL --database=db2 --local-infile=1 < $MYSQLTEST_VARDIR/tmp/row_event.sql
+--error ER_NO_SUCH_TABLE
+SELECT * FROM db2.t1;
+
+DROP DATABASE db1;
+# With gtid-mode=on we need purge gtid_executed, if not transactions
+# replayed through mysqlbinlog will be skipped.
+RESET MASTER;
+--echo [The event of table db1.t1 has been successfully applied to db2.t1]
+--exec $MYSQL --database=db2 --local-infile=1 < $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+--let $assert_text= Assert that table db2.t1 has no rows after applying the sql file.
+--let $assert_cond= `SELECT COUNT(*)=1 from db2.t1`
+--source include/assert.inc
+
+--echo [CLEANUP]
+--remove_file $MYSQLTEST_VARDIR/tmp/row_event.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/row_event_rewrite.sql
+
+DROP DATABASE db1;
+DROP DATABASE db2;

=== added file 'mysql-test/suite/binlog/t/percona_mysqlbinlog_rewritedb-master.opt'
--- mysql-test/suite/binlog/t/percona_mysqlbinlog_rewritedb-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/percona_mysqlbinlog_rewritedb-master.opt	2014-02-15 00:30:14 +0000
@@ -0,0 +1,1 @@
+--local-infile=1

=== added file 'mysql-test/suite/binlog/t/percona_mysqlbinlog_rewritedb.test'
--- mysql-test/suite/binlog/t/percona_mysqlbinlog_rewritedb.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/percona_mysqlbinlog_rewritedb.test	2014-02-15 00:30:14 +0000
@@ -0,0 +1,80 @@
+--source include/have_log_bin.inc
+#
+# WL #36: http://askmonty.org/worklog/Server-Sprint/?tid=36
+# This is basic test for --rewrite-db option.
+# mysqlbinlog --rewrite-db="from->to" should rewrite database name
+#
+
+--disable_query_log
+
+# Because RBR event DB rewrite requires shifting of
+# Table_map_log_event contents around if the DB name length
+# changes, this case is tested for both shorter and longer
+# names.
+
+--let DB1=a
+--let DB2=bbbbbbbbbbbbbbbbbbbb
+--let DB3=cccccccccccccccc
+--let DB4=d
+
+eval CREATE DATABASE $DB1; eval USE $DB1; CREATE TABLE t1(f INT);
+eval CREATE DATABASE $DB2; eval USE $DB2; CREATE TABLE t1(f INT);
+eval CREATE DATABASE $DB3; eval USE $DB3; CREATE TABLE t1(f INT);
+eval CREATE DATABASE $DB4; eval USE $DB4; CREATE TABLE t1(f INT);
+
+RESET MASTER;
+--let MYSQLD_DATA_DIR=`select @@datadir`
+--let LOAD_DATA_FILE=$MYSQLD_DATA_DIR/table.values
+--let BIN_LOG_FILE_NAME=query_get_value(show master status, File,    1)
+--let BIN_LOG_START_POSITION=query_get_value(show master status, Position, 1)
+eval USE $DB1; INSERT INTO t1 VALUES(0); INSERT INTO t1 VALUES(0);
+eval USE $DB2; INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
+write_file $LOAD_DATA_FILE;
+2
+2
+EOF
+eval USE $DB3;
+--eval LOAD DATA INFILE "$LOAD_DATA_FILE" INTO TABLE t1
+--let BIN_LOG_STOP_POSITION=query_get_value(show master status, Position, 1)
+FLUSH LOGS;
+
+--let BIN_LOG_FULL_PATH=`SELECT CONCAT("$MYSQLD_DATA_DIR", "$BIN_LOG_FILE_NAME")`
+
+--let i=10
+
+while ($i)
+{
+# Test for different combinations of syntax and db name filtering and rewriting
+--let REWRITE=`SELECT CASE $i WHEN 10 THEN '' WHEN 9 THEN '--rewrite-db="$DB1->$DB2" --rewrite-db="$DB3->$DB4" --database="$DB4"' WHEN 8 THEN '--rewrite-db="$DB1->$DB2" --rewrite-db="$DB3->$DB4" --database="$DB3"' WHEN 7 THEN '--rewrite-db="$DB1->$DB2" --rewrite-db="$DB3->$DB4" --database="$DB2"' WHEN 6 THEN '--rewrite-db="$DB1->$DB2" --rewrite-db="$DB3->$DB4" --database="$DB1"' WHEN 5 THEN '--rewrite-db="$DB1->$DB2" --rewrite-db="$DB3->$DB4"' WHEN 4 THEN '--rewrite-db="  $DB1  -> $DB2 , $DB3 ->   $DB4  "' WHEN 3 THEN '--rewrite-db="$DB1->$DB2,$DB3->$DB4"' WHEN 2 THEN '--rewrite-db="$DB1->$DB4"' WHEN 1 THEN '--rewrite-db="$DB1->$DB2"' END`
+
+eval USE $DB1; DELETE FROM t1;
+eval USE $DB2; DELETE FROM t1;
+eval USE $DB3; DELETE FROM t1;
+eval USE $DB4; DELETE FROM t1;
+
+--echo #
+--echo # Apply log with '$REWRITE'
+--echo #
+
+--exec $MYSQL_BINLOG $REWRITE --start-position=$BIN_LOG_START_POSITION --stop-position=$BIN_LOG_STOP_POSITION $BIN_LOG_FULL_PATH | $MYSQL --local-infile=1
+
+--echo # use $DB1
+eval USE $DB1; SELECT * FROM t1 ORDER BY f;
+--echo # use $DB2
+eval USE $DB2; SELECT * FROM t1 ORDER BY f;
+--echo # use $DB3
+eval USE $DB3; SELECT * FROM t1 ORDER BY f;
+--echo # use $DB4
+eval USE $DB4; SELECT * FROM t1 ORDER BY f;
+
+dec $i;
+}
+
+eval USE $DB1; DROP TABLE t1; eval DROP DATABASE $DB1;
+eval USE $DB2; DROP TABLE t1; eval DROP DATABASE $DB2;
+eval USE $DB3; DROP TABLE t1; eval DROP DATABASE $DB3;
+eval USE $DB4; DROP TABLE t1; eval DROP DATABASE $DB4;
+
+--remove_file $LOAD_DATA_FILE
+
+--enable_query_log

=== modified file 'sql/log_event.cc'
--- sql/log_event.cc	2013-12-16 08:45:31 +0000
+++ sql/log_event.cc	2014-02-15 00:30:14 +0000
@@ -11862,6 +11862,108 @@
   my_free(m_memory);
 }
 
+#ifdef MYSQL_CLIENT
+
+/*
+  Rewrite database name for the event to name specified by new_db
+  SYNOPSIS
+    new_db   Database name to change to
+    new_len  Length
+    desc     Event describing binlog that we're writing to.
+
+  DESCRIPTION
+    Reset db name. This function assumes that temp_buf member contains event
+    representation taken from a binary log. It resets m_dbnam and m_dblen and
+    rewrites temp_buf with new db name.
+
+  RETURN 
+    0     - Success
+    other - Error
+*/
+
+int Table_map_log_event::rewrite_db(const char* new_db, size_t new_len,
+                                    const Format_description_log_event* desc)
+{
+  DBUG_ENTER("Table_map_log_event::rewrite_db");
+  DBUG_ASSERT(temp_buf);
+
+  uint header_len= min((unsigned)desc->common_header_len,
+                       (unsigned)LOG_EVENT_MINIMAL_HEADER_LEN) + TABLE_MAP_HEADER_LEN;
+  int len_diff;
+
+  if (!(len_diff= new_len - m_dblen))
+  {
+    memcpy((void*) (temp_buf + header_len + 1), new_db, m_dblen + 1);
+    memcpy((void*) m_dbnam, new_db, m_dblen + 1);
+    DBUG_RETURN(0);
+  }
+
+  // Create new temp_buf
+  ulong event_cur_len= uint4korr(temp_buf + EVENT_LEN_OFFSET);
+  ulong event_new_len= event_cur_len + len_diff;
+  char* new_temp_buf= (char*) my_malloc(event_new_len, MYF(MY_WME));
+
+  if (!new_temp_buf)
+  {
+    sql_print_error("Table_map_log_event::rewrite_db: "
+                    "failed to allocate new temp_buf (%d bytes required)",
+                    event_new_len);
+    DBUG_RETURN(-1);
+  }
+
+  // Rewrite temp_buf
+  char* ptr= new_temp_buf;
+  ulong cnt= 0;
+
+  // Copy header and change event length
+  memcpy(ptr, temp_buf, header_len);
+  int4store(ptr + EVENT_LEN_OFFSET, event_new_len);
+  ptr += header_len;
+  cnt += header_len;
+
+  // Write new db name length and new name
+  *ptr++ = new_len;
+  memcpy(ptr, new_db, new_len + 1);
+  ptr += new_len + 1;
+  cnt += m_dblen + 2;
+
+  // Copy rest part
+  memcpy(ptr, temp_buf + cnt, event_cur_len - cnt);
+
+  // Reregister temp buf
+  free_temp_buf();
+  register_temp_buf(new_temp_buf);
+
+  // Reset m_dbnam and m_dblen members
+  m_dblen= new_len;
+
+  // m_dbnam resides in m_memory together with m_tblnam and m_coltype
+  uchar* memory= m_memory;
+  char const* tblnam= m_tblnam;
+  uchar* coltype= m_coltype;
+
+  m_memory= (uchar*) my_multi_malloc(MYF(MY_WME),
+                                     &m_dbnam, (uint) m_dblen + 1,
+                                     &m_tblnam, (uint) m_tbllen + 1,
+                                     &m_coltype, (uint) m_colcnt,
+                                     NullS);
+
+  if (!m_memory)
+  {
+    sql_print_error("Table_map_log_event::rewrite_db: "
+                    "failed to allocate new m_memory (%d + %d + %d bytes required)",
+                    m_dblen + 1, m_tbllen + 1, m_colcnt);
+    DBUG_RETURN(-1);
+  }
+
+  memcpy((void*)m_dbnam, new_db, m_dblen + 1);
+  memcpy((void*)m_tblnam, tblnam, m_tbllen + 1);
+  memcpy(m_coltype, coltype, m_colcnt);
+
+  my_free(memory);
+  DBUG_RETURN(0);
+}
+#endif /* MYSQL_CLIENT */
 /*
   Return value is an error code, one of:
 

=== modified file 'sql/log_event.h'
--- sql/log_event.h	2013-10-23 08:48:28 +0000
+++ sql/log_event.h	2014-02-15 00:30:14 +0000
@@ -3861,7 +3861,10 @@
   const Table_id& get_table_id() const { return m_table_id; }
   const char *get_table_name() const { return m_tblnam; }
   const char *get_db_name() const    { return m_dbnam; }
-
+#ifdef MYSQL_CLIENT
+  int rewrite_db(const char* new_name, size_t new_name_len,
+                 const Format_description_log_event*);
+#endif
   virtual Log_event_type get_type_code() { return TABLE_MAP_EVENT; }
   virtual bool is_valid() const { return m_memory != NULL; /* we check malloc */ }