Merge lp:~tsarev/percona-server/5.1-18205_02_wl36.patch into lp:percona-server/5.1

[Oleg Tsarev]

http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/249/

merge wl36.patch from lp:percona-server/rnt-5.1
Feature WL #36 description: http://askmonty.org/worklog/Server-Sprint/?tid=36

[Laurynas Biveinis (laurynas-biveinis)]

For the feature branch to go in, it needs an associated blueprint on Launchpad.

review: Needs Information

=== modified file 'Percona-Server/client/Makefile.am'
--- Percona-Server/client/Makefile.am	2011-07-03 15:47:37 +0000
+++ Percona-Server/client/Makefile.am	2012-02-09 15:07:20 +0000
@@ -24,6 +24,7 @@
 INCLUDES =			-I$(top_builddir)/include \
 				-I$(top_srcdir)/include \
 				-I$(top_srcdir)/regex \
+				-I$(top_srcdir)/sql \
                                 $(openssl_includes)
 
 LIBS =				@CLIENT_LIBS@
@@ -107,7 +108,8 @@
 	rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \
 	log_event.cc my_decimal.h my_decimal.cc \
 	log_event_old.h log_event_old.cc \
-	rpl_record_old.h rpl_record_old.cc
+	rpl_record_old.h rpl_record_old.cc \
+        sql_list.h rpl_filter.h sql_list.cc rpl_filter.cc
 strings_src=decimal.c
 
 link_sources:

=== modified file 'Percona-Server/client/client_priv.h'
--- Percona-Server/client/client_priv.h	2011-11-24 02:01:33 +0000
+++ Percona-Server/client/client_priv.h	2012-02-09 15:07:20 +0000
@@ -97,6 +97,7 @@
   OPT_SYSLOG,
 #endif
   OPT_FIRST_SLAVE,
+  OPT_REWRITE_DB,
   OPT_ALL,
   OPT_NO_REMOVE_EOL_CARRET,
   OPT_INNODB_OPTIMIZE_KEYS,

=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2011-07-11 16:13:27 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2012-02-09 15:07:20 +0000
@@ -38,6 +38,15 @@
 #include "sql_common.h"
 #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 
+/* Needed for Rpl_filter */
+CHARSET_INFO* system_charset_info= &my_charset_utf8_general_ci;
+
+#include "sql_string.h"                          // needed for Rpl_filter
+#include "sql_list.h"                            // needed for Rpl_filter
+#include "rpl_filter.h"
+
+Rpl_filter *binlog_filter;
+
 #define BIN_LOG_HEADER_SIZE	4
 #define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)
 
@@ -623,6 +632,49 @@
 
 
 /**
+  Print "use <db>" statement when current db is to be changed.
+
+  We have to control emiting USE statements according to rewrite-db options.
+  We have to do it here (see process_event() below) and to suppress
+  producing USE statements by corresponding log event print-functions.
+*/
+void print_use_stmt(PRINT_EVENT_INFO* pinfo, const char* db, size_t db_len)
+{
+  /*
+    pinfo->db is the current db.
+    If current db is the same as required db, do nothing.
+  */
+  if (!db || !memcmp(pinfo->db, db, db_len + 1))
+    return;
+
+  /*
+    Current db and required db are different.
+    Check for rewrite rule for required db. (Note that in a rewrite rule
+    neither db_from nor db_to part can be empty)
+  */
+  size_t      len_to= 0;
+  const char* db_to=  binlog_filter->get_rewrite_db(db, &len_to);
+
+  /*
+    If there is no rewrite rule for db (in this case len_to is left = 0),
+    printing of the corresponding USE statement is left for log event
+    print-function.
+  */
+  if (!len_to)
+    return;
+
+  // In case of rewrite rule print USE statement for db_to
+  fprintf(result_file, "use %s%s\n", db_to, pinfo->delimiter);
+
+  /*
+    Copy the *original* db to pinfo to suppress emiting
+    of USE stmts by log_event print-functions.
+  */
+  memcpy(pinfo->db, db, db_len + 1);
+}
+
+
+/**
   Prints the given event in base64 format.
 
   The header is printed to the head cache and the body is printed to
@@ -741,9 +793,22 @@
 
     switch (ev_type) {
     case QUERY_EVENT:
-      if (!((Query_log_event*)ev)->is_trans_keyword() &&
-          shall_skip_database(((Query_log_event*)ev)->db))
-        goto end;
+    {
+      Query_log_event *qe= (Query_log_event*)ev;
+      if (!qe->is_trans_keyword())
+      {
+        if (shall_skip_database(qe->db))
+          goto end;
+      }
+      else
+      {
+        /*
+          In case the event for one of these statements is obtained
+          from 5.0 binary log, make it compatible with 5.1.
+        */
+        ev->flags|= LOG_EVENT_SUPPRESS_USE_F;
+      }
+      print_use_stmt(print_event_info, qe->db, qe->db_len);
       if (opt_base64_output_mode == BASE64_OUTPUT_ALWAYS)
       {
         if ((retval= write_event_header_and_base64(ev, result_file,
@@ -754,6 +819,7 @@
       else
         ev->print(result_file, print_event_info);
       break;
+    }
 
     case CREATE_FILE_EVENT:
     {
@@ -875,6 +941,7 @@
 
       if (!shall_skip_database(exlq->db))
       {
+        print_use_stmt(print_event_info, exlq->db, exlq->db_len);
         if (fname)
         {
           convert_path_to_forward_slashes(fname);
@@ -898,6 +965,14 @@
         destroy_evt= FALSE;
         goto end;
       }
+      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;
+      }
     }
     case WRITE_ROWS_EVENT:
     case DELETE_ROWS_EVENT:
@@ -983,15 +1058,19 @@
   retval= ERROR_STOP;
 end:
   rec_count++;
+
+
   /*
-    Destroy the log_event object. If reading from a remote host,
-    set the temp_buf to NULL so that memory isn't freed twice.
+    Destroy the log_event object.
+    MariaDB MWL#36: mainline does this:
+      If reading from a remote host,
+      set the temp_buf to NULL so that memory isn't freed twice.
+    We no longer do that, we use Rpl_filter::event_owns_temp_buf instead.
   */
   if (ev)
   {
-    if (remote_opt)
-      ev->temp_buf= 0;
-    if (destroy_evt) /* destroy it later if not set (ignored table map) */
+    /* destroy it later if not set (ignored table map) */
+    if (destroy_evt)
       delete ev;
   }
   DBUG_RETURN(retval);
@@ -1156,6 +1235,10 @@
    "Used to reserve file descriptors for use by this program.",
    &open_files_limit, &open_files_limit, 0, GET_ULONG,
    REQUIRED_ARG, MY_NFILE, 8, OS_FILE_LIMIT, 0, 1, 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}
 };
 
@@ -1347,6 +1430,53 @@
         (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;
+    char* key= argument;                         // db-from
+    char* val;                                   // db-to
+
+    // Where key begins
+    while (*key && my_isspace(&my_charset_latin1, *key))
+      key++;
+
+    // Where val begins
+    if (!(ptr= strstr(argument, "->")))
+    {
+      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= 0;
+
+    if (!*val)
+    {
+      sql_print_error("Bad syntax in rewrite-db: empty db-to!\n");
+      return 1;
+    }
+
+    binlog_filter->add_db_rewrite(key, val);
+    break;
+  }
   case 'v':
     if (argument == disabled_my_option)
       verbose= 0;
@@ -1616,7 +1746,7 @@
       If reading from a remote host, ensure the temp_buf for the
       Log_event class is pointing to the incoming stream.
     */
-    ev->register_temp_buf((char *) net->read_pos + 1);
+    ev->register_temp_buf((char *) net->read_pos + 1, FALSE);
 
     Log_event_type type= ev->get_type_code();
     if (glob_description_event->binlog_version >= 3 ||
@@ -2016,6 +2146,8 @@
   return retval;
 }
 
+/* Used in sql_alloc(). Inited and freed in main() */
+MEM_ROOT s_mem_root;
 
 int main(int argc, char** argv)
 {
@@ -2028,6 +2160,13 @@
 
   my_init_time(); // for time functions
 
+  init_alloc_root(&s_mem_root, 16384, 0);
+  if (!(binlog_filter= new Rpl_filter))
+  {
+    error("Failed to create Rpl_filter");
+    exit(1);
+  }
+
   if (load_defaults("my", load_default_groups, &argc, &argv))
     exit(1);
   defaults_argv= argv;
@@ -2116,6 +2255,8 @@
   if (result_file != stdout)
     my_fclose(result_file, MYF(0));
   cleanup();
+  delete binlog_filter;
+  free_root(&s_mem_root, MYF(0));
   free_defaults(defaults_argv);
   my_free_open_file_info();
   load_processor.destroy();
@@ -2127,6 +2268,12 @@
   DBUG_RETURN(retval == ERROR_STOP ? 1 : 0);
 }
 
+
+void *sql_alloc(size_t size)
+{
+  return alloc_root(&s_mem_root, size);
+}
+
 /*
   We must include this here as it's compiled with different options for
   the server
@@ -2137,4 +2284,7 @@
 #include "my_decimal.cc"
 #include "log_event.cc"
 #include "log_event_old.cc"
+#include "sql_string.cc"
+#include "sql_list.cc"
+#include "rpl_filter.cc"
 

=== modified file 'Percona-Server/client/sql_string.cc'
--- Percona-Server/client/sql_string.cc	2011-11-01 06:50:54 +0000
+++ Percona-Server/client/sql_string.cc	2012-02-09 15:07:20 +0000
@@ -28,15 +28,6 @@
 #ifdef HAVE_FCONVERT
 #include <floatingpoint.h>
 #endif
-
-/*
-  The following extern declarations are ok as these are interface functions
-  required by the string function
-*/
-
-extern void sql_alloc(size_t size);
-extern void sql_element_free(void *ptr);
-
 #include "sql_string.h"
 
 /*****************************************************************************

=== modified file 'Percona-Server/client/sql_string.h'
--- Percona-Server/client/sql_string.h	2011-06-30 15:37:13 +0000
+++ Percona-Server/client/sql_string.h	2012-02-09 15:07:20 +0000
@@ -17,6 +17,9 @@
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
+#ifndef CLIENT_SQL_STRING_H
+#define CLIENT_SQL_STRING_H
+
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class implementation */
 #endif
@@ -359,3 +362,5 @@
     return (s->alloced && Ptr >= s->Ptr && Ptr < s->Ptr + s->str_length);
   }
 };
+
+#endif 

=== added file 'Percona-Server/mysql-test/include/wl36.inc'
--- Percona-Server/mysql-test/include/wl36.inc	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/include/wl36.inc	2012-02-09 15:07:20 +0000
@@ -0,0 +1,51 @@
+#
+# 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
+#
+
+CREATE DATABASE a; USE a; CREATE TABLE t1(a INT);
+CREATE DATABASE b; USE b; CREATE TABLE t1(b INT);
+CREATE DATABASE c; USE c; CREATE TABLE t1(c INT);
+
+RESET MASTER;
+--let MYSQLD_DATA_DIR=`select @@datadir`
+--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)
+USE a; INSERT INTO t1 VALUES(0);
+USE b; INSERT INTO t1 VALUES(1);
+--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=3
+# i=3: rewrite nothing
+# i=2: rewrite a->c
+# i=0: rewrite a->b
+--disable_query_log
+while ($i)
+{
+--let REWRITE=`SELECT CASE $i WHEN 3 THEN '' WHEN 2 THEN '--rewrite-db="a->c"' WHEN 1 THEN '--rewrite-db="a->b"' END`
+
+USE a; DELETE FROM t1;
+USE b; DELETE FROM t1;
+USE c; 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
+
+USE a; SELECT * FROM t1;
+USE b; SELECT * FROM t1;
+USE c; SELECT * FROM t1;
+
+dec $i;
+}
+--enable_query_log
+
+USE a; DROP TABLE t1; DROP DATABASE a;
+USE b; DROP TABLE t1; DROP DATABASE b;
+USE c; DROP TABLE t1; DROP DATABASE c;

=== modified file 'Percona-Server/mysql-test/r/mysqlbinlog.result'
--- Percona-Server/mysql-test/r/mysqlbinlog.result	2011-03-25 14:16:13 +0000
+++ Percona-Server/mysql-test/r/mysqlbinlog.result	2012-02-09 15:07:20 +0000
@@ -220,7 +220,6 @@
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
 SET TIMESTAMP=1108844556/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
@@ -228,6 +227,7 @@
 SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
+use test/*!*/;
 SET TIMESTAMP=1108844555/*!*/;
 insert t1 values (1)
 /*!*/;
@@ -239,7 +239,6 @@
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
 SET TIMESTAMP=1108844556/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
@@ -247,6 +246,7 @@
 SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
+use test/*!*/;
 SET TIMESTAMP=1108844555/*!*/;
 insert t1 values (1)
 /*!*/;
@@ -581,7 +581,6 @@
 SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use test/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 SavePoint mixed_cases
 /*!*/;
@@ -592,11 +591,9 @@
 SET TIMESTAMP=1266652094/*!*/;
 INSERT INTO db1.t1 VALUES(40)
 /*!*/;
-use test/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 ROLLBACK TO mixed_cases
 /*!*/;
-use db1/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 INSERT INTO db1.t2 VALUES("after rollback to")
 /*!*/;
@@ -624,7 +621,6 @@
 SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use test/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 SavePoint mixed_cases
 /*!*/;

=== added file 'Percona-Server/mysql-test/r/wl36-mixed.result'
--- Percona-Server/mysql-test/r/wl36-mixed.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/wl36-mixed.result	2012-02-09 15:07:20 +0000
@@ -0,0 +1,48 @@
+CREATE DATABASE a;
+USE a;
+CREATE TABLE t1(a INT);
+CREATE DATABASE b;
+USE b;
+CREATE TABLE t1(b INT);
+CREATE DATABASE c;
+USE c;
+CREATE TABLE t1(c INT);
+RESET MASTER;
+USE a;
+INSERT INTO t1 VALUES(0);
+USE b;
+INSERT INTO t1 VALUES(1);
+FLUSH LOGS;
+#
+# Apply log with ''
+#
+a
+0
+b
+1
+c
+#
+# Apply log with '--rewrite-db="a->c"'
+#
+a
+b
+1
+c
+0
+#
+# Apply log with '--rewrite-db="a->b"'
+#
+a
+b
+0
+1
+c
+USE a;
+DROP TABLE t1;
+DROP DATABASE a;
+USE b;
+DROP TABLE t1;
+DROP DATABASE b;
+USE c;
+DROP TABLE t1;
+DROP DATABASE c;

=== added file 'Percona-Server/mysql-test/r/wl36-row.result'
--- Percona-Server/mysql-test/r/wl36-row.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/wl36-row.result	2012-02-09 15:07:20 +0000
@@ -0,0 +1,48 @@
+CREATE DATABASE a;
+USE a;
+CREATE TABLE t1(a INT);
+CREATE DATABASE b;
+USE b;
+CREATE TABLE t1(b INT);
+CREATE DATABASE c;
+USE c;
+CREATE TABLE t1(c INT);
+RESET MASTER;
+USE a;
+INSERT INTO t1 VALUES(0);
+USE b;
+INSERT INTO t1 VALUES(1);
+FLUSH LOGS;
+#
+# Apply log with ''
+#
+a
+0
+b
+1
+c
+#
+# Apply log with '--rewrite-db="a->c"'
+#
+a
+b
+1
+c
+0
+#
+# Apply log with '--rewrite-db="a->b"'
+#
+a
+b
+0
+1
+c
+USE a;
+DROP TABLE t1;
+DROP DATABASE a;
+USE b;
+DROP TABLE t1;
+DROP DATABASE b;
+USE c;
+DROP TABLE t1;
+DROP DATABASE c;

=== added file 'Percona-Server/mysql-test/r/wl36-statement.result'
--- Percona-Server/mysql-test/r/wl36-statement.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/wl36-statement.result	2012-02-09 15:07:20 +0000
@@ -0,0 +1,48 @@
+CREATE DATABASE a;
+USE a;
+CREATE TABLE t1(a INT);
+CREATE DATABASE b;
+USE b;
+CREATE TABLE t1(b INT);
+CREATE DATABASE c;
+USE c;
+CREATE TABLE t1(c INT);
+RESET MASTER;
+USE a;
+INSERT INTO t1 VALUES(0);
+USE b;
+INSERT INTO t1 VALUES(1);
+FLUSH LOGS;
+#
+# Apply log with ''
+#
+a
+0
+b
+1
+c
+#
+# Apply log with '--rewrite-db="a->c"'
+#
+a
+b
+1
+c
+0
+#
+# Apply log with '--rewrite-db="a->b"'
+#
+a
+b
+0
+1
+c
+USE a;
+DROP TABLE t1;
+DROP DATABASE a;
+USE b;
+DROP TABLE t1;
+DROP DATABASE b;
+USE c;
+DROP TABLE t1;
+DROP DATABASE c;

=== added file 'Percona-Server/mysql-test/t/wl36-mixed.test'
--- Percona-Server/mysql-test/t/wl36-mixed.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/wl36-mixed.test	2012-02-09 15:07:20 +0000
@@ -0,0 +1,3 @@
+--source include/have_log_bin.inc
+--source include/have_binlog_format_mixed.inc
+--source include/wl36.inc

=== added file 'Percona-Server/mysql-test/t/wl36-row.test'
--- Percona-Server/mysql-test/t/wl36-row.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/wl36-row.test	2012-02-09 15:07:20 +0000
@@ -0,0 +1,3 @@
+--source include/have_log_bin.inc
+--source include/have_binlog_format_row.inc
+--source include/wl36.inc

=== added file 'Percona-Server/mysql-test/t/wl36-statement.test'
--- Percona-Server/mysql-test/t/wl36-statement.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/wl36-statement.test	2012-02-09 15:07:20 +0000
@@ -0,0 +1,3 @@
+--source include/have_log_bin.inc
+--source include/have_binlog_format_statement.inc
+--source include/wl36.inc

=== modified file 'Percona-Server/sql/log_event.cc'
--- Percona-Server/sql/log_event.cc	2012-01-30 04:30:33 +0000
+++ Percona-Server/sql/log_event.cc	2012-02-09 15:07:20 +0000
@@ -1134,7 +1134,7 @@
     goto err;
   }
   if ((res= read_log_event(buf, data_len, &error, description_event)))
-    res->register_temp_buf(buf);
+    res->register_temp_buf(buf, TRUE);
 
 err:
   UNLOCK_MUTEX;
@@ -8271,6 +8271,111 @@
   my_free(m_memory, MYF(MY_ALLOW_ZERO_PTR));
 }
 
+
+#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(desc->common_header_len,
+                       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, TRUE);
+
+  // 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, MYF(MY_WME));
+  DBUG_RETURN(0);
+}
+#endif /* MYSQL_CLIENT */
+
+
 /*
   Return value is an error code, one of:
 

=== modified file 'Percona-Server/sql/log_event.h'
--- Percona-Server/sql/log_event.h	2012-01-30 04:30:33 +0000
+++ Percona-Server/sql/log_event.h	2012-02-09 15:07:20 +0000
@@ -889,6 +889,13 @@
      event's type, and its content is distributed in the event-specific fields.
   */
   char *temp_buf;
+  
+  /*
+    TRUE <=> this event 'owns' temp_buf and should call my_free() when done
+    with it
+  */
+  bool event_owns_temp_buf;
+
   /*
     Timestamp on the master(for debugging and replication of
     NOW()/TIMESTAMP).  It is important for queries and LOAD DATA
@@ -1030,12 +1037,17 @@
   Log_event(const char* buf, const Format_description_log_event
             *description_event);
   virtual ~Log_event() { free_temp_buf();}
-  void register_temp_buf(char* buf) { temp_buf = buf; }
+  void register_temp_buf(char* buf, bool must_free)
+  {
+    temp_buf=            buf;
+    event_owns_temp_buf= must_free;
+  }
   void free_temp_buf()
   {
     if (temp_buf)
     {
-      my_free(temp_buf, MYF(0));
+      if (event_owns_temp_buf)
+        my_free(temp_buf, MYF(0));
       temp_buf = 0;
     }
   }
@@ -3360,6 +3372,8 @@
   ulong 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; }
+  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; }

=== modified file 'Percona-Server/sql/mysql_priv.h'
--- Percona-Server/sql/mysql_priv.h	2011-11-24 02:01:21 +0000
+++ Percona-Server/sql/mysql_priv.h	2012-02-09 15:07:20 +0000
@@ -93,12 +93,16 @@
 #include "unireg.h"
 
 void init_sql_alloc(MEM_ROOT *root, uint block_size, uint pre_alloc_size);
+#endif // MYSQL_CLIENT
+
 void *sql_alloc(size_t);
 void *sql_calloc(size_t);
 char *sql_strdup(const char *str);
 char *sql_strmake(const char *str, size_t len);
 void *sql_memdup(const void * ptr, size_t size);
 void sql_element_free(void *ptr);
+
+#ifndef MYSQL_CLIENT
 char *sql_strmake_with_convert(const char *str, size_t arg_length,
 			       CHARSET_INFO *from_cs,
 			       size_t max_res_length,

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2012-02-07 03:25:46 +0000
+++ Percona-Server/sql/mysqld.cc	2012-02-09 15:07:20 +0000
@@ -8469,6 +8469,7 @@
   }
   case (int)OPT_REPLICATE_REWRITE_DB:
   {
+    /* See also OPT_REWRITE_DB handling in client/mysqlbinlog.cc */
     char* key = argument,*p, *val;
 
     if (!(p= strstr(argument, "->")))

=== modified file 'Percona-Server/sql/rpl_filter.cc'
--- Percona-Server/sql/rpl_filter.cc	2011-06-30 15:37:13 +0000
+++ Percona-Server/sql/rpl_filter.cc	2012-02-09 15:07:20 +0000
@@ -48,6 +48,7 @@
 }
 
 
+#ifndef MYSQL_CLIENT
 /*
   Returns true if table should be logged/replicated 
 
@@ -132,6 +133,7 @@
               !do_table_inited && !wild_do_table_inited);
 }
 
+#endif
 
 /*
   Checks whether a db matches some do_db and ignore_db rules
@@ -517,6 +519,13 @@
 }
 
 
+bool
+Rpl_filter::rewrite_db_is_empty()
+{
+  return rewrite_db.is_empty();
+}
+
+
 const char*
 Rpl_filter::get_rewrite_db(const char* db, size_t *new_len)
 {

=== modified file 'Percona-Server/sql/rpl_filter.h'
--- Percona-Server/sql/rpl_filter.h	2007-05-10 09:59:39 +0000
+++ Percona-Server/sql/rpl_filter.h	2012-02-09 15:07:20 +0000
@@ -42,7 +42,9 @@
  
   /* Checks - returns true if ok to replicate/log */
 
-  bool tables_ok(const char* db, TABLE_LIST* tables);
+#ifndef MYSQL_CLIENT
+  bool tables_ok(const char* db, TABLE_LIST *tables);
+#endif 
   bool db_ok(const char* db);
   bool db_ok_with_wild_table(const char *db);
 
@@ -69,6 +71,7 @@
   void get_wild_do_table(String* str);
   void get_wild_ignore_table(String* str);
 
+  bool rewrite_db_is_empty();
   const char* get_rewrite_db(const char* db, size_t *new_len);
 
   I_List<i_string>* get_do_db();

=== modified file 'Percona-Server/sql/sql_string.cc'
--- Percona-Server/sql/sql_string.cc	2011-10-31 09:10:04 +0000
+++ Percona-Server/sql/sql_string.cc	2012-02-09 15:07:20 +0000
@@ -39,6 +39,9 @@
 
 #include "sql_string.h"
 
+#ifdef MYSQL_CLIENT
+#error Attempt to use server-side sql_string on client. Use client/sql_string.cc
+#endif 
 /*****************************************************************************
 ** String functions
 *****************************************************************************/

=== modified file 'Percona-Server/sql/sql_string.h'
--- Percona-Server/sql/sql_string.h	2011-07-03 15:47:37 +0000
+++ Percona-Server/sql/sql_string.h	2012-02-09 15:07:20 +0000
@@ -1,3 +1,6 @@
+#ifndef MYSQL_SQL_STRING_H_INCLUDED
+#define MYSQL_SQL_STRING_H_INCLUDED
+
 /*
    Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
@@ -25,6 +28,10 @@
 #define NOT_FIXED_DEC			31
 #endif
 
+#ifdef MYSQL_CLIENT
+#error Attempt to use server-side sql_string on client. Use client/sql_string.h
+#endif 
+
 class String;
 int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
 String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
@@ -408,3 +415,5 @@
 {
   return str+ cs->cset->scan(cs, str, end, MY_SEQ_SPACES) == end;
 }
+
+#endif // MYSQL_SQL_STRING_H_INCLUDED

=== modified file 'Percona-Server/sql/thr_malloc.cc'
--- Percona-Server/sql/thr_malloc.cc	2011-06-30 15:37:13 +0000
+++ Percona-Server/sql/thr_malloc.cc	2012-02-09 15:07:20 +0000
@@ -65,11 +65,13 @@
 }
 
 
+#ifndef MYSQL_CLIENT
 void *sql_alloc(size_t Size)
 {
   MEM_ROOT *root= *my_pthread_getspecific_ptr(MEM_ROOT**,THR_MALLOC);
   return alloc_root(root,Size);
 }
+#endif
 
 
 void *sql_calloc(size_t size)

=== added file 'doc/source/flexibility/mysqlbinlog_change_db.rst'
--- doc/source/flexibility/mysqlbinlog_change_db.rst	1970-01-01 00:00:00 +0000
+++ doc/source/flexibility/mysqlbinlog_change_db.rst	2012-02-09 15:07:20 +0000
@@ -0,0 +1,43 @@
+.. _mysqlbinlog_change_db:
+
+=========================
+Ability to change database for mysqlbinlog
+=========================
+
+Sometimes there is a need to take a binary log and apply it to a database with 
+a different name than the original name of the database on binlog producer.
+
+If one is using statement-based replication, he can achieve this by grepping
+out "USE dbname" statements out of the output of mysqlbinlog(*).  With
+row-based replication this is no longer possible, as database name is encoded
+within the the BINLOG '....' statement.
+
+This task is about adding an option to mysqlbinlog that would allow to change 
+the names of used databases in both RBR and SBR events.
+
+Varible :variable:`rewrite-db` of **mysqlbinlog** utility allows to setup rewriting rule "from->"to".
+
+Version Specific Information
+============================
+
+  * 5.1.62-12.1
+    Full functionality.
+
+Client Command Line Parameter
+=============================
+
+.. variable:: rewrite-db
+
+     :cli: Yes
+     :conf: Yes
+     :scope: Global
+     :dyn: No
+     :vartype: String
+     :default: Off
+
+
+Related Reading
+===============
+
+  * `WL #36 <http://askmonty.org/worklog/Server-Sprint/?tid=36>`_
+

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2012-01-31 10:35:01 +0000
+++ doc/source/index.rst	2012-02-09 15:07:20 +0000
@@ -88,6 +88,7 @@
    flexibility/innodb_files_extend
    flexibility/log_warnings_suppress
    flexibility/mysql_remove_eol_carret
+   flexibility/mysqlbinlog_change_db
    flexibility/replication_skip_single_statement
    flexibility/buff_read_ahead_area
    flexibility/innodb_fast_shutdown