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

[Oleg Tsarev]

Renamed patch mwl36.patch to wl36.patch.
Fixed code policy.
Added test.

I didn't run full testing on Jenkins, because changes in code doesn't change the compile result.
I added new test "wl36" and checked it locally, also with --repeat option (test works fine).

(issue 18205 - prepare lp:percona-server/rnt-5.1 patches to merge to lp:percona-server/5.1)

after merge this fix to lp:percona-server/rnt-5.1 I will propose for merge it to lp:percona-server/5.1

[Laurynas Biveinis (laurynas-biveinis)]

Based on my understanding of the coding standards, there is no need to rewrite single-line
// foo
to
/* foo */

The standards say:

    Single-line comments like this are OK in C++

 // We must check if stack_size = Solaris 2.9 can return 0 here.

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

LGTM, thank you.

review: Approve

=== modified file 'patches/series'
--- patches/series	2011-12-22 14:17:38 +0000
+++ patches/series	2012-01-31 08:20:27 +0000
@@ -69,7 +69,7 @@
 bug860910.patch
 bug45702.patch
 mysqlbinlog_fix.patch
-mwl36.patch
+wl36.patch
 wl47.patch
 wl5151.patch
 slave_type_conversions_error_on_truncate.patch

=== renamed file 'patches/mwl36.patch' => 'patches/wl36.patch'
--- patches/mwl36.patch	2011-11-17 12:41:18 +0000
+++ patches/wl36.patch	2012-01-31 08:20:27 +0000
@@ -44,8 +44,8 @@
 +/* 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 "sql_string.h"                          // needed for Rpl_filter
++#include "sql_list.h"                            // needed for Rpl_filter
 +#include "rpl_filter.h"
 +
 +Rpl_filter *binlog_filter;
@@ -53,7 +53,7 @@
  #define BIN_LOG_HEADER_SIZE	4
  #define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)
  
-@@ -623,6 +632,42 @@
+@@ -623,6 +633,49 @@
  
  
  /**
@@ -63,31 +63,38 @@
 +  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.
++  /*
++    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);
++  /*
++    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 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.
++  /*
++    Copy the *original* db to pinfo to suppress emiting
++    of USE stmts by log_event print-functions.
++  */
 +  memcpy(pinfo->db, db, db_len + 1);
 +}
 +
@@ -96,28 +103,33 @@
    Prints the given event in base64 format.
  
    The header is printed to the head cache and the body is printed to
-@@ -741,9 +786,11 @@
+@@ -741,10 +798,12 @@
  
      switch (ev_type) {
      case QUERY_EVENT:
+-      if (!((Query_log_event*)ev)->is_trans_keyword())
 +    {
 +      Query_log_event *qe= (Query_log_event*)ev;
-       if (!((Query_log_event*)ev)->is_trans_keyword())
++      if (!qe->is_trans_keyword())
        {
 -        if (shall_skip_database(((Query_log_event*)ev)->db))
 +        if (shall_skip_database(qe->db))
            goto end;
        }
        else
-@@ -752,6 +799,7 @@
-         // from binary log 5.0, make it compatible with 5.1
+       {
+@@ -754,16 +815,18 @@
+         */
          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,
-@@ -762,6 +810,7 @@
+                                                    print_event_info)) !=
+             OK_CONTINUE)
+           goto end;
+       }
        else
          ev->print(result_file, print_event_info);
        break;
@@ -125,7 +137,7 @@
  
      case CREATE_FILE_EVENT:
      {
-@@ -883,6 +932,7 @@
+@@ -885,6 +952,7 @@
  
        if (!shall_skip_database(exlq->db))
        {
@@ -133,12 +145,13 @@
          if (fname)
          {
            convert_path_to_forward_slashes(fname);
-@@ -906,6 +956,13 @@
+@@ -908,6 +976,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);
++      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");
@@ -147,15 +160,16 @@
      }
      case WRITE_ROWS_EVENT:
      case DELETE_ROWS_EVENT:
-@@ -991,14 +1048,16 @@
+@@ -993,16 +1069,20 @@
    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. 
++    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.
@@ -165,10 +179,14 @@
    {
 -    if (remote_opt)
 -      ev->temp_buf= 0;
-     if (destroy_evt) /* destroy it later if not set (ignored table map) */
+-    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;
    }
-@@ -1164,6 +1223,10 @@
+   DBUG_RETURN(retval);
+ }
+@@ -1166,6 +1248,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},
@@ -179,7 +197,7 @@
    {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
  };
  
-@@ -1355,6 +1418,53 @@
+@@ -1359,6 +1445,53 @@
          (find_type_or_exit(argument, &base64_output_mode_typelib, opt->name)-1);
      }
      break;
@@ -187,8 +205,8 @@
 +  {
 +    /* See also handling of OPT_REPLICATE_REWRITE_DB in sql/mysqld.cc */
 +    char* ptr;
-+    char* key= argument;  // db-from
-+    char* val;            // db-to
++    char* key= argument;                         // db-from
++    char* val;                                   // db-to
 +
 +    // Where key begins
 +    while (*key && my_isspace(&my_charset_latin1, *key))
@@ -233,7 +251,7 @@
    case 'v':
      if (argument == disabled_my_option)
        verbose= 0;
-@@ -1628,7 +1738,7 @@
+@@ -1632,7 +1775,7 @@
        If reading from a remote host, ensure the temp_buf for the
        Log_event class is pointing to the incoming stream.
      */
@@ -242,7 +260,7 @@
  
      Log_event_type type= ev->get_type_code();
      if (glob_description_event->binlog_version >= 3 ||
-@@ -2028,6 +2138,8 @@
+@@ -2032,6 +2175,8 @@
    return retval;
  }
  
@@ -251,7 +269,7 @@
  
  int main(int argc, char** argv)
  {
-@@ -2040,6 +2152,13 @@
+@@ -2044,6 +2189,13 @@
  
    my_init_time(); // for time functions
  
@@ -265,7 +283,7 @@
    if (load_defaults("my", load_default_groups, &argc, &argv))
      exit(1);
    defaults_argv= argv;
-@@ -2128,6 +2247,8 @@
+@@ -2132,6 +2284,8 @@
    if (result_file != stdout)
      my_fclose(result_file, MYF(0));
    cleanup();
@@ -274,7 +292,7 @@
    free_defaults(defaults_argv);
    my_free_open_file_info();
    load_processor.destroy();
-@@ -2139,6 +2260,12 @@
+@@ -2143,6 +2297,12 @@
    DBUG_RETURN(retval == ERROR_STOP ? 1 : 0);
  }
  
@@ -287,7 +305,7 @@
  /*
    We must include this here as it's compiled with different options for
    the server
-@@ -2149,4 +2276,7 @@
+@@ -2153,4 +2313,7 @@
  #include "my_decimal.cc"
  #include "log_event.cc"
  #include "log_event_old.cc"
@@ -475,9 +493,9 @@
              *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; 
++  void register_temp_buf(char* buf, bool must_free)
++  {
++    temp_buf=            buf;
 +    event_owns_temp_buf= must_free;
 +  }
    void free_temp_buf()
@@ -490,7 +508,7 @@
        temp_buf = 0;
      }
    }
-@@ -3358,6 +3370,8 @@
+@@ -3358,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; }
@@ -635,3 +653,112 @@
  
  
  void *sql_calloc(size_t size)
+--- /dev/null
++++ b/mysql-test/r/wl36.result
+@@ -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;
+--- /dev/null
++++ b/mysql-test/t/wl36.test
+@@ -0,0 +1,55 @@
++#
++# 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
++#
++
++--source include/have_log_bin.inc
++
++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 'patches/wl47.patch'
--- patches/wl47.patch	2011-11-17 12:41:18 +0000
+++ patches/wl47.patch	2012-01-31 08:20:27 +0000
@@ -116,7 +116,7 @@
      case TABLE_MAP_EVENT:
      {
        Table_map_log_event *map= ((Table_map_log_event *)ev);
-@@ -956,6 +1034,13 @@
+@@ -956,5 +1034,12 @@
          destroy_evt= FALSE;
          goto end;
        }
@@ -127,9 +127,8 @@
 +      */
 +      print_annotate_event(print_event_info);
 +
-       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))
+       size_t      len_to= 0;
+       const char* db_to=  binlog_filter->get_rewrite_db(map->get_db_name(),
 @@ -992,6 +1077,13 @@
            if (print_event_info->m_table_map_ignored.count() > 0)
              print_event_info->m_table_map_ignored.clear_tables();