An error occurred fetching the project authors.
  1. 27 Jul, 2007 1 commit
    • unknown's avatar
      WL#3228 (NDB) : RBR using different table defs on slave/master · ef79d224
      unknown authored
      This patch adds the ability to store extra field metadata in the table
      map event. This data can include pack_length() or field_lenght() for
      fields such as CHAR or VARCHAR enabling developers to add code that
      can check for compatibilty between master and slave columns. More 
      importantly, the extra field metadata can be used to store data from the
      master correctly should a VARCHAR field on the master be <= 255 bytes 
      while the same field on the slave is > 255 bytes. '
      
      The patch also includes the needed changes to unpack to ensure that data
      which is smaller on the master can be unpacked correctly on the slave.
      
      
      mysql-test/extra/rpl_tests/rpl_log.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to display slave status vertically.
      mysql-test/r/rpl_ndb_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_rbr_to_sbr.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_basic_11bugs.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_create_table.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_flsh_tbls.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_inexist_tbl.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_log_innodb.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_max_relay_size.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_row_until.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/r/rpl_stm_log.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the rpl_log.test modifications.
      mysql-test/r/rpl_truncate_7ndb.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      mysql-test/t/rpl_row_create_table.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      mysql-test/t/rpl_row_flsh_tbls.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the test to coincide with changes to binlog
        size of table map event.
      sql/field.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch includes updates to the unpack() methods for the variable
        length fields. A new parameter was added (from_length) that is the
        value stored in the field_metadata of the table map from the table_def
        class. If the value is non-zero and less than what the field on the 
        slave is then use the from_length else use the original value from the
        field on the slave.
      sql/field.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch includes updates to the unpack() methods for the variable
        length fields. A new parameter was added (from_length) that is the
        value stored in the field_metadata of the table map from the table_def
        class.
      sql/log_event.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds methods to calculate the field metadata size, prepare
        the field metadata for writing to the binlog, and additions to the
        Table_map_log_event::write_body method to include the field metadata 
        in the table map that is written to the binlog.
      sql/log_event.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds method declarations and variables needed to support
        storing field metadata in the table map that is written to the binlog.
      sql/rpl_record.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch modifies the unpack_row() method to unpack fields passing in
        the value from the table_def class. This value is the extra field
        metadata stored there from the master.
      sql/rpl_rli.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds a helper function to retrieve the table_def for a given
        table in the RPL_TABLE_LIST structure.
      sql/rpl_utility.cc:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch adds a helper method that retrieves the correct size 
        parameter for the field. This method is used to compare the size as
        sent by the master with that on the slave for all types of fields that
        can vary in size and storage requirements.
      sql/rpl_utility.h:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch changes the table_def class constructor to pass in the raw
        data read from the table map and extract it into an array of dimension
        size (number of fields). It also adds a method to return the field 
        metadata for any field. The method returns the data stored in the table
        map or 0 if no data was stored for that field. Lastly, a method to return
        the results of field->maybe_null() is included so that the slave can
        determine if a field that is not on the slave is null.
      mysql-test/t/rpl_colSize.test:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a new test designed to test the feature of having
        columns on the master that are smaller than what is on the slave.
      mysql-test/r/rpl_colSize.result:
        WL#3228 : RBR using different table defs on slave/master
        
        This patch contains a result file for the new test designed to test the 
        feature of having columns on the master that are smaller than what is 
        on the slave.
      ef79d224
  2. 30 Mar, 2007 1 commit
    • unknown's avatar
      - Fixing binary log positions · 5a7b2fc7
      unknown authored
      - Eliminating some compiler warnings
      
      
      mysql-test/extra/binlog_tests/blackhole.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
        Using include file for SHOW BINLOG EVENTS.
      mysql-test/include/show_binlog_events.inc:
        Fixing regex replace to handle XIDs as well.
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_blackhole.result:
        Result change
      mysql-test/r/binlog_row_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_row_drop_tmp_tbl.result:
        Result change
      mysql-test/r/binlog_row_insert_select.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_blackhole.result:
        Result change
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_ndb_multi.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_charset.result:
        Result change
      mysql-test/r/rpl_row_create_table.result:
        Result change
      mysql-test/r/rpl_row_delayed_ins.result:
        Result change
      mysql-test/r/rpl_row_drop.result:
        Result change
      mysql-test/r/rpl_row_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_reset_slave.result:
        Result change
      mysql-test/r/rpl_row_until.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change
      mysql-test/r/rpl_udf.result:
        Result change
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Fixing binary log position
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Fixing binary log position.
      sql/log_event.cc:
        Eliminating compiler warnings.
      5a7b2fc7
  3. 29 Mar, 2007 1 commit
    • unknown's avatar
      WL#3464: Add replication event to denote gap in replication · adaf162b
      unknown authored
      Adding an event that can be used to denote that an incident occured
      on the master. The event can be used to denote a gap in the replication
      stream, but can also be used to denote other incidents.
      
      In addition, the injector interface is extended with functions to
      generate an incident event. The function will also rotate the binary
      log after generating an incident event to get a fresh binary log.
      
      
      client/Makefile.am:
        Adding file rpl_constants.h with constants for replication.
      mysql-test/extra/binlog_tests/binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
        Binlog position change
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Binlog position change
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_log.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_sp002.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_row_sp003.test:
        Binlog position change
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Binlog position change
      mysql-test/include/show_binlog_events.inc:
        Binlog position change
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_row_insert_select.result:
        Result change
      mysql-test/r/binlog_row_mix_innodb_myisam.result:
        Result change
      mysql-test/r/binlog_stm_binlog.result:
        Result change
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Result change
      mysql-test/r/binlog_stm_insert_select.result:
        Result change
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/ctype_cp932_binlog_stm.result:
        Result change
      mysql-test/r/flush_block_commit_notembedded.result:
        Result change
      mysql-test/r/rpl_000015.result:
        Result change
      mysql-test/r/rpl_change_master.result:
        Result change
      mysql-test/r/rpl_deadlock_innodb.result:
        Result change
      mysql-test/r/rpl_flushlog_loop.result:
        Result change
      mysql-test/r/rpl_loaddata.result:
        Result change
      mysql-test/r/rpl_loaddata_s.result:
        Result change
      mysql-test/r/rpl_log_pos.result:
        Result change
      mysql-test/r/rpl_ndb_charset.result:
        Result change
      mysql-test/r/rpl_ndb_log.result:
        Result change
      mysql-test/r/rpl_ndb_multi.result:
        Result change
      mysql-test/r/rpl_rbr_to_sbr.result:
        Result change
      mysql-test/r/rpl_rotate_logs.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_charset.result:
        Result change
      mysql-test/r/rpl_row_create_table.result:
        Result change
      mysql-test/r/rpl_row_delayed_ins.result:
        Result change
      mysql-test/r/rpl_row_drop.result:
        Result change
      mysql-test/r/rpl_row_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change
      mysql-test/r/rpl_row_log.result:
        Result change
      mysql-test/r/rpl_row_log_innodb.result:
        Result change
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change
      mysql-test/r/rpl_row_reset_slave.result:
        Result change
      mysql-test/r/rpl_row_until.result:
        Result change
      mysql-test/r/rpl_server_id1.result:
        Result change
      mysql-test/r/rpl_server_id2.result:
        Result change
      mysql-test/r/rpl_sp.result:
        Result change
      mysql-test/r/rpl_stm_charset.result:
        Result change
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Result change
      mysql-test/r/rpl_stm_log.result:
        Result change
      mysql-test/r/rpl_stm_max_relay_size.result:
        Result change
      mysql-test/r/rpl_stm_multi_query.result:
        Result change
      mysql-test/r/rpl_stm_reset_slave.result:
        Result change
      mysql-test/r/rpl_stm_until.result:
        Result change
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Result change
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change
      mysql-test/r/rpl_truncate_7ndb.result:
        Result change
      mysql-test/r/user_var-binlog.result:
        Result change
      mysql-test/t/binlog_row_mix_innodb_myisam.test:
        Binlog position change
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        Binlog position change
      mysql-test/t/ctype_cp932_binlog_stm.test:
        Binlog position change
      mysql-test/t/mysqlbinlog.test:
        Binlog position change
      mysql-test/t/mysqlbinlog2.test:
        Binlog position change
      mysql-test/t/rpl_loaddata_s.test:
        Binlog position change
      mysql-test/t/rpl_log_pos.test:
        Binlog position change
      mysql-test/t/rpl_row_basic_11bugs.test:
        Binlog position change
      mysql-test/t/rpl_row_create_table.test:
        Binlog position change
      mysql-test/t/rpl_row_flsh_tbls.test:
        Binlog position change
      mysql-test/t/rpl_row_mysqlbinlog.test:
        Binlog position change
      mysql-test/t/rpl_sp.test:
        Binlog position change
      mysql-test/t/rpl_stm_flsh_tbls.test:
        Binlog position change
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        Binlog position change
      mysql-test/t/user_var-binlog.test:
        Binlog position change
      sql/Makefile.am:
        Adding file rpl_constants.h with constants for replication.
      sql/log_event.cc:
        Changing prototype for read_str() to be const-correct and changing code to match that.
        Adding incident log event.
      sql/log_event.h:
        Adding incident log event.
      sql/rpl_injector.cc:
        Adding support for generating incidents into the binary log.
      sql/rpl_injector.h:
        Adding support for generating incidents into the binary log.
      sql/share/errmsg.txt:
        Adding new error message to indicate an incident.
      sql/sql_parse.cc:
        Adding code to generate an incident log event just before executing a REPLACE
        if the variable "incident_database_resync_on_replace" is set.
      mysql-test/r/rpl_incident.result:
        New BitKeeper file ``mysql-test/r/rpl_incident.result''
      mysql-test/t/rpl_incident.test:
        New BitKeeper file ``mysql-test/t/rpl_incident.test''
      sql/rpl_constants.h:
        New BitKeeper file ``sql/rpl_constants.h''
      adaf162b
  4. 12 Feb, 2007 1 commit
    • unknown's avatar
      BUG#22583 (RBR between MyISAM and non-MyISAM tables containing BIT field · e4146a9f
      unknown authored
      does not work): Changing packed row format to only include null bits
      for those columns that are present in the row as well as writing BIT
      columns in a storage engine-independent format.
      
      The change in row format is incompatible with the previous format and a
      slave will not be able to read the new events.
      
      
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Position change since Format_description_log_event is longer.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Position change since Format_description_log_event is longer.
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Position change since Format_description_log_event is longer.
      mysql-test/r/rpl_000015.result:
        Result change.
      mysql-test/r/rpl_change_master.result:
        Result change.
      mysql-test/r/rpl_deadlock_innodb.result:
        Result change.
      mysql-test/r/rpl_flushlog_loop.result:
        Result change.
      mysql-test/r/rpl_log_pos.result:
        Result change.
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change.
      mysql-test/r/rpl_row_charset.result:
        Result change.
      mysql-test/r/rpl_row_create_table.result:
        Result change.
      mysql-test/r/rpl_row_delayed_ins.result:
        Result change.
      mysql-test/r/rpl_row_drop.result:
        Result change.
      mysql-test/r/rpl_row_flsh_tbls.result:
        Result change.
      mysql-test/r/rpl_row_inexist_tbl.result:
        Result change.
      mysql-test/r/rpl_row_log.result:
        Result change.
      mysql-test/r/rpl_row_log_innodb.result:
        Result change.
      mysql-test/r/rpl_row_max_relay_size.result:
        Result change.
      mysql-test/r/rpl_row_reset_slave.result:
        Result change.
      mysql-test/r/rpl_row_until.result:
        Result change.
      mysql-test/r/rpl_server_id1.result:
        Result change.
      mysql-test/r/rpl_server_id2.result:
        Result change.
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        Result change.
      mysql-test/r/rpl_truncate_2myisam.result:
        Result change.
      mysql-test/r/rpl_truncate_3innodb.result:
        Result change.
      mysql-test/t/rpl_loaddata_s.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_log_pos.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_basic_11bugs-master.opt:
        Adding --innodb option
      mysql-test/t/rpl_row_basic_11bugs.test:
        Testing explicitly for RBR MyISAM -> InnoDB and vice versa.
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_create_table.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_flsh_tbls.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_row_mysqlbinlog.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/rpl_switch_stm_row_mixed.test:
        Position change since Format_description_log_event is longer.
      mysql-test/t/user_var-binlog.test:
        Position change since Format_description_log_event is longer.
      sql/log_event.cc:
        Changing packed row format to only include null bits for those columns
        that are present in the row as well as writing BIT columns in a storage
        engine-independent format.
        
        Changing unpack_row() to accomodate for the changes.
      sql/log_event.h:
        Renumbering old row events and adding new codes.
      sql/sql_class.cc:
        Changing packed row format to only include null bits for those columns
        that are present in the row as well as writing BIT columns in a storage
        engine-independent format.
        
        Changing THD::pack_row() to accomodate for the changes and adding
        documentation.
      mysql-test/t/rpl_row_basic_11bugs-slave.opt:
        New BitKeeper file ``mysql-test/t/rpl_row_basic_11bugs-slave.opt''
      e4146a9f
  5. 08 Feb, 2006 1 commit
    • unknown's avatar
      Update test results · 329752f4
      unknown authored
      mysql-test/r/binlog_row_blackhole.result:
        Update test results to reflect use of std_data_ln
      mysql-test/r/rpl_row_flsh_tbls.result:
        Update test results, drop tables to clean up
      mysql-test/r/rpl_row_log.result:
        Update test results to reflect use of std_data_ln
      329752f4
  6. 22 Dec, 2005 1 commit
    • unknown's avatar
      WL#1012: All changes as one single changeset. · 09346e6e
      unknown authored
      This includes both code and test cases.
      
      
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Delete: mysql-test/r/ctype_ucs_binlog.result
      BitKeeper/deleted/.del-rpl_delete_all.result~7c050d592614b3f:
        Delete: mysql-test/r/rpl_delete_all.result
      BitKeeper/deleted/.del-rpl000013-slave.opt~18266ad8a2403e8d:
        Delete: mysql-test/t/rpl000013-slave.opt
      BitKeeper/deleted/.del-rpl_delete_all.test~700a1490277780e0:
        Delete: mysql-test/t/rpl_delete_all.test
      mysql-test/extra/binlog_tests/binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/blackhole.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_ddl.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_loaddata_m.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_log.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_reset_slave.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_EE_err.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Import patch wl1012.patch
      mysql-test/extra/rpl_tests/rpl_user_variables.test:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_binlog.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_blackhole.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_cp932.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_ctype_ucs.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_drop_tmp_tbl.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_insert_select.result:
        Import patch wl1012.patch
      mysql-test/r/binlog_stm_mix_innodb_myisam.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000012.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_000015.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_deadlock_innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_flushlog_loop.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata_s.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_000001.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_EE_err.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_charset.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_ddl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_err_ignoredtable.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_flsh_tbls.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_loaddata_m.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_log.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_max_relay_size.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_multi_query.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_mystery22.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_reset_slave.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_rewrt_db.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_sp.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_timezone.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_until.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_user_variables.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_stm_view.result:
        Import patch wl1012.patch
      mysql-test/t/binlog_row_binlog-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_000012.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.slave-mi:
        Import patch wl1012.patch
      mysql-test/t/rpl_000015.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_deadlock_innodb-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-master.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop-slave.sh:
        Import patch wl1012.patch
      mysql-test/t/rpl_flushlog_loop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata_s.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_000001-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_err_ignoredtable-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_loaddata_m-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_log-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_mystery22.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_rewrt_db.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp-slave.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_sp.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-master.opt:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone-slave.opt:
        Import patch wl1012.patch
      BUILD/SETUP.sh:
        Import patch wl1012.patch
      Makefile.am:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_timezone.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_until.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_stm_view.test:
        Import patch wl1012.patch
      client/Makefile.am:
        Import patch wl1012.patch
      client/client_priv.h:
        Import patch wl1012.patch
      client/mysqlbinlog.cc:
        Import patch wl1012.patch
      configure.in:
        Import patch wl1012.patch
      include/Makefile.am:
        Import patch wl1012.patch
      include/base64.h:
        Import patch wl1012.patch
      include/config-win.h:
        Import patch wl1012.patch
      include/my_base.h:
        Import patch wl1012.patch
      include/my_global.h:
        Import patch wl1012.patch
      mysql-test/Makefile.am:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.pl:
        Import patch wl1012.patch
      mysql-test/mysql-test-run.sh:
        Import patch wl1012.patch
      mysql-test/r/date_formats.result:
        Import patch wl1012.patch
      mysql-test/r/flush_block_commit.result:
        Import patch wl1012.patch
      mysql-test/r/innodb.result:
        Import patch wl1012.patch
      mysql-test/r/rpl000017.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_change_master.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_commit_after_flush.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_create_database.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_do_grant.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_loaddata.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_log_pos.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_delete.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_multi_update.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_openssl.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_replicate_do.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_rotate_logs.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id1.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_server_id2.result:
        Import patch wl1012.patch
      mysql-test/r/rpl_temporary.result:
        Import patch wl1012.patch
      mysql-test/r/user_var-binlog.result:
        Import patch wl1012.patch
      mysql-test/t/create_select_tmp.test:
        Import patch wl1012.patch
      mysql-test/t/date_formats.test:
        Import patch wl1012.patch
      mysql-test/t/disabled.def:
        Import patch wl1012.patch
      mysql-test/t/innodb.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog.test:
        Import patch wl1012.patch
      mysql-test/t/mysqlbinlog2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000002.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000006.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000013.test:
        Import patch wl1012.patch
      mysql-test/t/rpl000017.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_auto_increment.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_change_master.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_commit_after_flush.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_create_database.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_do_grant.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_drop.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_empty_master_crash.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_failed_optimize.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_heap.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_id.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_insert_ignore.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_loaddata.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_log_pos.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_delete.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update2.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_multi_update3.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_openssl.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_redirect.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_relayrotate.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_replicate_do.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_rotate_logs.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_server_id1.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_sp_effects.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_temporary.test:
        Import patch wl1012.patch
      mysql-test/t/rpl_trigger.test:
        Import patch wl1012.patch
      mysql-test/t/sp.test:
        Import patch wl1012.patch
      mysql-test/t/user_var-binlog.test:
        Import patch wl1012.patch
      mysys/Makefile.am:
        Import patch wl1012.patch
      mysys/base64.c:
        Import patch wl1012.patch
      sql/Makefile.am:
        Import patch wl1012.patch
      sql/ha_innodb.cc:
        Import patch wl1012.patch
      sql/ha_innodb.h:
        Import patch wl1012.patch
      sql/ha_partition.cc:
        Import patch wl1012.patch
      sql/handler.cc:
        Import patch wl1012.patch
      sql/handler.h:
        Import patch wl1012.patch
      sql/item_sum.cc:
        Import patch wl1012.patch
      sql/log.cc:
        Import patch wl1012.patch
      sql/log_event.cc:
        Import patch wl1012.patch
      sql/log_event.h:
        Import patch wl1012.patch
      sql/mysql_priv.h:
        Import patch wl1012.patch
      sql/mysqld.cc:
        Import patch wl1012.patch
      sql/rpl_filter.h:
        Import patch wl1012.patch
      sql/set_var.cc:
        Import patch wl1012.patch
      sql/share/errmsg.txt:
        Import patch wl1012.patch
      sql/slave.cc:
        Import patch wl1012.patch
      sql/slave.h:
        Import patch wl1012.patch
      sql/sp.cc:
        Import patch wl1012.patch
      sql/sp_head.cc:
        Import patch wl1012.patch
      sql/sql_acl.cc:
        Import patch wl1012.patch
      sql/sql_base.cc:
        Import patch wl1012.patch
      sql/sql_class.cc:
        Import patch wl1012.patch
      sql/sql_class.h:
        Import patch wl1012.patch
      sql/sql_delete.cc:
        Import patch wl1012.patch
      sql/sql_insert.cc:
        Import patch wl1012.patch
      sql/sql_lex.h:
        Import patch wl1012.patch
      sql/sql_list.h:
        Import patch wl1012.patch
      sql/sql_load.cc:
        Import patch wl1012.patch
      sql/sql_parse.cc:
        Import patch wl1012.patch
      sql/sql_plugin.cc:
        Import patch wl1012.patch
      sql/sql_rename.cc:
        Import patch wl1012.patch
      sql/sql_repl.h:
        Import patch wl1012.patch
      sql/sql_select.cc:
        Import patch wl1012.patch
      sql/sql_show.cc:
        Import patch wl1012.patch
      sql/sql_table.cc:
        Import patch wl1012.patch
      sql/sql_udf.cc:
        Import patch wl1012.patch
      sql/sql_union.cc:
        Import patch wl1012.patch
      sql/sql_update.cc:
        Import patch wl1012.patch
      sql/sql_yacc.yy:
        Import patch wl1012.patch
      sql/table.cc:
        Import patch wl1012.patch
      sql/table.h:
        Import patch wl1012.patch
      storage/innobase/include/lock0lock.h:
        Import patch wl1012.patch
      storage/innobase/include/row0mysql.h:
        Import patch wl1012.patch
      storage/innobase/include/row0vers.h:
        Import patch wl1012.patch
      storage/innobase/lock/lock0lock.c:
        Import patch wl1012.patch
      storage/innobase/row/row0mysql.c:
        Import patch wl1012.patch
      storage/innobase/row/row0sel.c:
        Import patch wl1012.patch
      storage/innobase/row/row0vers.c:
        Import patch wl1012.patch
      09346e6e