An error occurred fetching the project authors.
  1. 30 Aug, 2006 1 commit
    • unknown's avatar
      Changes made according to HLD/LLD. · 930e542f
      unknown authored
         The following is an excerption from the WL.
            
         1. Change so that MIXED is default format
            1.1 to change the default for command line --binlog-format
            1.2 to alter global_system_variables.binlog_format calculation
                basing on command line --binlog-format parameter and 
                its default.
         2. Change test suite so that more testing is done by MIXED format.
            2.1 to check if there are test cases requiring --binlog-foramt=statement via
                `source include/have_binlog_format_statement.inc' and affected by 
                altering the latter to be "mixed".
            2.2 to check the content of such vulnerable cases to find if
                extending to the mixed does not modify results. In that case simply
                substitute source arguments as explained.
            2.3 if a test in mixed mode deals with features triggering
                row-binlogging then if necessary we can switch explicitly
                to statement mode or create another test to run with 
                non-recommended STATEMENT mode
         
                Particullarily, extracting INSERT DELAYED 
                binlogging subtest for statement mode is performed, and 
                the snippet is moved into a separate test file.
                Note that since now all three modes verify this use case
                through 3 different tests.
         
         No changes in item 3 of HLD appeared to be needed.
      
      
      mysql-test/extra/binlog_tests/binlog.test:
        Moving INSERT DELAYED verification section into separate file. The latter is sourced
        from two different files: the current one and a newly created for STATEMENT
        mode check.
      mysql-test/extra/rpl_tests/rpl_loaddata.test:
        require mixed_or_statement
      mysql-test/extra/rpl_tests/rpl_stm_000001.test:
        require mixed_or_statement
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        require mixed_or_statement
      mysql-test/r/binlog_stm_binlog.result:
        new result to correspond to MIXED mode.
      mysql-test/r/rpl_rbr_to_sbr.result:
        result changed
      mysql-test/t/archive.test:
        require mixed_or_statement
      mysql-test/t/binlog_stm_binlog.test:
        require exclusive mixed format because of INSERT DELAYED.
      mysql-test/t/binlog_stm_blackhole.test:
        require mixed_or_statement
      mysql-test/t/binlog_stm_ctype_cp932.test:
        require mixed_or_statement
      mysql-test/t/binlog_stm_ctype_ucs.test:
        require mixed_or_statement
      mysql-test/t/binlog_stm_drop_tmp_tbl.test:
        require mixed_or_statement
      mysql-test/t/binlog_stm_innodb_stat.test:
        require mixed_or_statement
      mysql-test/t/binlog_stm_insert_select.test:
        require mixed_or_statement
      mysql-test/t/binlog_stm_mix_innodb_myisam.test:
        require mixed_or_statement
      mysql-test/t/create_select_tmp.test:
        require mixed_or_statement
      mysql-test/t/ctype_cp932_binlog_stm.test:
        require mixed_or_statement
      mysql-test/t/date_formats.test:
        MIXED case appended to the replace instruction
      mysql-test/t/mysqlbinlog.test:
        require mixed_or_statement
      mysql-test/t/mysqlbinlog2.test:
        require mixed_or_statement
      mysql-test/t/ndb_multi.test:
        require mixed_or_statement
      mysql-test/t/rpl000013.test:
        require mixed_or_statement
      mysql-test/t/rpl_heap.test:
        require mixed_or_statement
      mysql-test/t/rpl_loaddata_s.test:
        require mixed_or_statement
      mysql-test/t/rpl_mixed_ddl_dml.test:
        require mixed_or_statement
      mysql-test/t/rpl_rbr_to_sbr.test:
        Rather meaningless line is discarded.
        The test does not loose anything without it and without considering the WL.
      mysql-test/t/rpl_rewrt_db.test:
        require mixed_or_statement
      mysql-test/t/rpl_rotate_logs.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_EE_err2.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_flsh_tbls.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_log.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_max_relay_size.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_multi_query.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_mystery22.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_no_op.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_reset_slave.test:
        require mixed_or_statement
      mysql-test/t/rpl_stm_until.test:
        require mixed_or_statement
      mysql-test/t/rpl_temp_table.test:
        require mixed_or_statement
      mysql-test/t/rpl_trigger.test:
        require mixed_or_statement
      mysql-test/t/rpl_trunc_temp.test:
        require mixed_or_statement
      mysql-test/t/user_var-binlog.test:
        require mixed_or_statement
      sql/mysqld.cc:
        Implementation of making BINLOG_FORMAT_MIXED to be the default of
        global_system_variables.binlog_format. Not in the case of embedded.
      mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
        Snippend sourced from two tests to verify INSERT DELAYED in all three binlog formats.
      mysql-test/include/have_binlog_format_mixed.inc:
        Part of exclusive MIXED format requirement
      mysql-test/include/have_binlog_format_mixed_or_statement.inc:
        requirement to have mixed or statement. Most of the tests with STATEMENT format indeed
        are tolerant to MIXED format to yield the same result files. There are few exception
        because of features triggering RBR events when MIXED format.
      mysql-test/r/binlog_statement_insert_delayed.result:
        BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed_default/mysql-test/r/binlog_statement_insert_delayed.result
      mysql-test/r/have_binlog_format_mixed.require:
        Exclusive MIXED format
      mysql-test/t/binlog_statement_insert_delayed.test:
        BitKeeper file /home/elkin/MySQL/TEAM/FIXES/5.1/wl3368_mixed_default/mysql-test/t/binlog_statement_insert_delayed.test
      930e542f
  2. 24 Feb, 2006 1 commit
    • unknown's avatar
      WL#3023 (RBR: Use locks in a statement-like manner): · 613fb54f
      unknown authored
        Adaptions to make it work with NDB.
      
      
      mysql-test/extra/binlog_tests/binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/blackhole.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/ctype_cp932.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/drop_temp_table.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/insert_select-binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_log.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_multi_query.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_row_charset.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
        Using replace_regex to remove table id.
      mysql-test/extra/rpl_tests/rpl_stm_charset.test:
        Using replace_regex to remove table id.
      mysql-test/include/rpl_row_basic.inc:
        Removing sync with master on cleanup since there are engines that does
        not work in a "syncronized" fashion on dropping tables.
      mysql-test/r/binlog_row_binlog.result:
        Result change
      mysql-test/r/binlog_row_blackhole.result:
        Result change
      mysql-test/r/binlog_row_ctype_cp932.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/ctype_cp932_binlog_row.result:
        Result change
      mysql-test/r/rpl_row_basic_11bugs.result:
        Result change
      mysql-test/r/rpl_row_basic_2myisam.result:
        Result change
      mysql-test/r/rpl_row_basic_3innodb.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_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_sp008.result:
        Result change
      mysql-test/t/binlog_stm_binlog.test:
        Using replace_regex to remove table id.
      mysql-test/t/ndb_binlog_ddl_multi.test:
        Using replace_regex to remove table id.
      mysql-test/t/ndb_binlog_ignore_db.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_heap.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_loaddata_s.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_ndb_blob.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_ndb_disk.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_basic_11bugs.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_create_table.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_drop.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_row_sp008.test:
        Using replace_regex to remove table id.
      mysql-test/t/rpl_sp.test:
        Using replace_regex to remove table id.
      mysql-test/t/sp.test:
        Using replace_regex to remove table id.
      mysql-test/t/sp_notembedded.test:
        Using replace_regex to remove table id.
      mysql-test/t/user_var-binlog.test:
        Using replace_regex to remove table id.
      sql/ha_ndbcluster_binlog.cc:
        Assign_new_table_id() now takes table share.
        Removed gratuitous friend declaration of ndb_add_binlog_index().
        Turning of binlogging during execution of ndb_add_binlog_index().
      sql/handler.h:
        Removed gratuitous friend declaration of ndb_add_binlog_index().
      sql/log.cc:
        Adding debug printout.
      sql/log_event.cc:
        Closing thread tables on dummy event.
      sql/rpl_injector.cc:
        Added support for new locking scheme.
      sql/rpl_injector.h:
        Added support for new locking scheme.
      613fb54f
  3. 14 Feb, 2006 1 commit
  4. 06 Feb, 2006 1 commit
    • unknown's avatar
      Two new tests for replace_regex · 42cffe06
      unknown authored
      mysql-test/r/binlog_stm_binlog.result:
        Result
      mysql-test/r/mysqltest.result:
        Result
      mysql-test/t/binlog_stm_binlog.test:
        New test for replace_regex
      mysql-test/t/mysqltest.test:
        New test for replace_regex
      42cffe06
  5. 04 Jan, 2006 1 commit
    • unknown's avatar
      Big patch to make embedded-server working in 5.x · 6b27acbd
      unknown authored
      Now it supports queries returning several results
      (particularly important with the SP)
      
      
      include/mysql.h:
        embedded_query_result structure added
      libmysql/libmysql.c:
        embedded-server related fixes
      libmysqld/emb_qcache.cc:
        multiple-result support added
      libmysqld/embedded_priv.h:
        embedded_query_result struct implemented
      libmysqld/lib_sql.cc:
        multiple-result support added
      libmysqld/libmysqld.c:
        small fixes
      mysql-test/t/backup.test:
        test fixed
      mysql-test/t/binlog_stm_binlog.test:
        test fixed
      mysql-test/t/binlog_stm_blackhole.test:
        test fixed
      mysql-test/t/binlog_stm_ctype_cp932.test:
        test fixed
      mysql-test/t/compress.test:
        test fixed
      mysql-test/t/delayed.test:
        test fixed
      mysql-test/t/federated.test:
        test fixed
      mysql-test/t/federated_archive.test:
        test fixed
      mysql-test/t/federated_bug_13118.test:
        test fixed
      mysql-test/t/federated_transactions.test:
        test fixed
      mysql-test/t/flush_table.test:
        test fixed
      mysql-test/t/handler.test:
        test fixed
      mysql-test/t/init_connect.test:
        test fixed
      mysql-test/t/innodb.test:
        test fixed
      mysql-test/t/mysql.test:
        test fixed
      mysql-test/t/mysql_client_test.test:
        test fixed
      mysql-test/t/mysqltest.test:
        test fixed
      mysql-test/t/query_cache.test:
        test fixed
      mysql-test/t/query_cache_notembedded.test:
        test fixed
      mysql-test/t/read_only.test:
        test fixed
      mysql-test/t/skip_grants.test:
        test fixed
      mysql-test/t/sp-destruct.test:
        test fixed
      mysql-test/t/sp-error.test:
        test fixed
      mysql-test/t/sp-threads.test:
        test fixed
      mysql-test/t/sp.test:
        test fixed
      mysql-test/t/view.test:
        test fixed
      mysql-test/t/wait_timeout.test:
        test fixed
      sql-common/client.c:
        small fixes
      sql/mysqld.cc:
        embedded-server related fix
      sql/protocol.cc:
        embedded-server related fix
      sql/protocol.h:
        embedded-server related fix
      sql/sql_class.cc:
        embedded-server related fix
      sql/sql_class.h:
        embedded-server related fix
      sql/sql_cursor.cc:
        embedded-server related fix
      sql/sql_parse.cc:
        embedded-server related fix
      sql/sql_prepare.cc:
        embedded-server related fix
      6b27acbd
  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