MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:He Zhenxing Date:March 23 2010 9:16am
Subject:bzr commit into mysql-6.0-codebase-bugfixing branch (zhenxing.he:3847)
View as plain text  
#At file:///media/sdb2/hezx/work/mysql/bzrwork/merge/6.0-codebase-bugfixing/ based on revid:alik@stripped

 3847 He Zhenxing	2010-03-23 [merge]
      Manual merge from next-mr-bugfixing

    D  mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt
    M  mysql-test/suite/binlog/r/binlog_unsafe.result
    M  mysql-test/suite/rpl/r/rpl_bug41902.result
    M  mysql-test/suite/rpl/r/rpl_user.result
    M  mysql-test/suite/rpl/t/rpl_bug41902.test
    M  mysql-test/suite/rpl/t/rpl_slow_query_log.test
    M  mysql-test/suite/rpl/t/rpl_user.test
    M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt
    M  sql/sql_acl.cc
    2497.1456.1 He Zhenxing	2010-03-22 [merge]
                Auto merge from 5.1-rpl-merge

        D  mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
        D  mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt
        M  mysql-test/extra/rpl_tests/rpl_failed_optimize.test
        M  mysql-test/suite/binlog/r/binlog_unsafe.result
        M  mysql-test/suite/rpl/r/rpl_failed_optimize.result
        M  mysql-test/suite/rpl/r/rpl_read_only.result
        M  mysql-test/suite/rpl/r/rpl_user.result
        M  mysql-test/suite/rpl/t/disabled.def
        M  mysql-test/suite/rpl/t/rpl_bug41902.test
        M  mysql-test/suite/rpl/t/rpl_read_only.test
        M  mysql-test/suite/rpl/t/rpl_slow_query_log.test
        M  mysql-test/suite/rpl/t/rpl_user.test
        M  mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
        M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt
        M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
        M  sql/sql_acl.cc
    2497.1454.17 He Zhenxing	2010-03-20 [merge]
                Manual merge from 5.1-rep+2

        M  mysql-test/suite/rpl/t/rpl_slow_query_log.test
        M  mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
        M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt
        M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
        2497.1293.25 He Zhenxing	2010-03-14 [merge]
                    auto merge from 5.1 main

            M  COPYING
        2497.1293.24 Sven Sandberg	2010-03-03
                    Post-merge fix (2).
                    Moved new error messages in sql/share/errmsg.txt (introduced in
                    5.1-rep+2, not currently existing in 5.1) so that they have the
                    same order in 5.1-rep+2 as in next-mr.
             @ mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
                Updated error numbers that changed.
             @ sql/share/errmsg.txt
                Moved new error messages in sql/share/errmsg.txt (introduced in
                5.1-rep+2, not currently existing in 5.1) so that they have the
                same order in 5.1-rep+2 as in next-mr.

            M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
            M  sql/share/errmsg.txt
        2497.1293.23 Sven Sandberg	2010-03-03
                    Post-merge fix.
                    Moved new error messages (introduced in 5.1-rep+2, not currently
                    existing in 5.1) to the end of sql/share/errmsg.txt
             @ mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
                Updated error numbers that changed.
             @ sql/share/errmsg.txt
                Moved new error messages (introduced in 5.1-rep+2, not currently
                existing in 5.1) to the end of the file.

            M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
            M  sql/share/errmsg.txt
        2497.1293.22 Sven Sandberg	2010-03-03 [merge]
                    merged gca(5.1,next-mr) -> 5.1-rep+2
                    conflicts:
                    Text conflict in mysql-test/mysql-test-run.pl
                    Text conflict in mysql-test/r/log_state.result
                    Text conflict in mysql-test/r/show_check.result
                    Text conflict in mysql-test/r/sp-error.result
                    Text conflict in mysql-test/r/sp.result
                    Text conflict in mysql-test/r/sp_trans.result
                    Text conflict in mysql-test/r/type_blob.result
                    Text conflict in mysql-test/r/type_timestamp.result
                    Text conflict in mysql-test/r/warnings.result
                    Text conflict in mysql-test/suite/rpl/r/rpl_slow_query_log.result
                    Text conflict in mysql-test/suite/rpl/r/rpl_sp.result
                    Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
                    Text conflict in sql/mysqld.cc

            A  mysql-test/include/not_binlog_format_row.inc
            A  mysql-test/r/bug39022.result
            A  mysql-test/r/no_binlog.result
            A  mysql-test/r/partition_debug_sync.result
            A  mysql-test/std_data/bug48449.frm
            A  mysql-test/t/bug39022.test
            A  mysql-test/t/no_binlog.test
            A  mysql-test/t/partition_debug_sync.test
            R  mysql-test/r/variables+c.result => mysql-test/r/variables_community.result
            R  mysql-test/t/variables+c.test => mysql-test/t/variables_community.test
            M  client/mysql.cc
            M  client/mysql_upgrade.c
            M  client/mysqladmin.cc
            M  client/mysqlbinlog.cc
            M  client/mysqlcheck.c
            M  client/mysqldump.c
            M  client/mysqlimport.c
            M  client/mysqlshow.c
            M  client/mysqlslap.c
            M  client/mysqltest.cc
            M  cmd-line-utils/readline/rlmbutil.h
            M  cmd-line-utils/readline/text.c
            M  configure.in
            M  extra/yassl/include/yassl_error.hpp
            M  extra/yassl/src/ssl.cpp
            M  extra/yassl/src/yassl_error.cpp
            M  mysql-test/Makefile.am
            M  mysql-test/extra/rpl_tests/rpl_loaddata.test
            M  mysql-test/include/mtr_warnings.sql
            M  mysql-test/lib/My/ConfigFactory.pm
            M  mysql-test/lib/My/SafeProcess.pm
            M  mysql-test/lib/My/SafeProcess/safe_process_win.cc
            M  mysql-test/lib/mtr_cases.pm
            M  mysql-test/lib/mtr_gprof.pl
            M  mysql-test/lib/mtr_misc.pl
            M  mysql-test/lib/mtr_report.pm
            M  mysql-test/lib/mtr_stress.pl
            M  mysql-test/lib/v1/mtr_stress.pl
            M  mysql-test/lib/v1/mysql-test-run.pl
            M  mysql-test/mysql-test-run.pl
            M  mysql-test/r/archive.result
            M  mysql-test/r/backup.result
            M  mysql-test/r/bigint.result
            M  mysql-test/r/csv.result
            M  mysql-test/r/default.result
            M  mysql-test/r/delete.result
            M  mysql-test/r/fulltext.result
            M  mysql-test/r/func_gconcat.result
            M  mysql-test/r/func_time.result
            M  mysql-test/r/group_by.result
            M  mysql-test/r/group_min_max.result
            M  mysql-test/r/having.result
            M  mysql-test/r/innodb-autoinc.result
            M  mysql-test/r/innodb_mysql.result
            M  mysql-test/r/join.result
            M  mysql-test/r/log_state.result
            M  mysql-test/r/multi_update.result
            M  mysql-test/r/myisam.result
            M  mysql-test/r/mysqltest.result
            M  mysql-test/r/sp-bugs.result
            M  mysql-test/r/sp_notembedded.result
            M  mysql-test/r/subselect.result
            M  mysql-test/r/type_bit.result
            M  mysql-test/r/view.result
            M  mysql-test/r/view_grant.result
            M  mysql-test/suite/rpl/r/rpl_slow_query_log.result
            M  mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
            M  mysql-test/suite/rpl/t/rpl_slow_query_log.test
            M  mysql-test/suite/sys_vars/r/log_basic.result
            M  mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
            M  mysql-test/suite/sys_vars/r/slow_query_log_func.result
            M  mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
            M  mysql-test/suite/sys_vars/t/slow_query_log_func.test
            M  mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
            M  mysql-test/t/archive.test
            M  mysql-test/t/bigint.test
            M  mysql-test/t/csv.test
            M  mysql-test/t/delete.test
            M  mysql-test/t/fulltext.test
            M  mysql-test/t/func_gconcat.test
            M  mysql-test/t/group_by.test
            M  mysql-test/t/group_min_max.test
            M  mysql-test/t/having.test
            M  mysql-test/t/innodb-autoinc.test
            M  mysql-test/t/innodb_mysql.test
            M  mysql-test/t/join.test
            M  mysql-test/t/multi_update.test
            M  mysql-test/t/myisam.test
            M  mysql-test/t/mysqltest.test
            M  mysql-test/t/partition_innodb_semi_consistent.test
            M  mysql-test/t/sp-bugs.test
            M  mysql-test/t/sp_notembedded.test
            M  mysql-test/t/subselect.test
            M  mysql-test/t/type_bit.test
            M  mysql-test/t/view.test
            M  mysql-test/t/view_grant.test
            M  mysys/default.c
            M  scripts/Makefile.am
            M  scripts/mysqld_multi.sh
            M  server-tools/instance-manager/options.cc
            M  sql/field.cc
            M  sql/ha_partition.cc
            M  sql/item.cc
            M  sql/item.h
            M  sql/item_cmpfunc.h
            M  sql/item_row.cc
            M  sql/item_sum.cc
            M  sql/item_timefunc.cc
            M  sql/log_event.cc
            M  sql/log_event_old.cc
            M  sql/mysql_priv.h
            M  sql/mysqld.cc
            M  sql/opt_range.cc
            M  sql/opt_sum.cc
            M  sql/share/Makefile.am
            M  sql/share/errmsg.txt
            M  sql/sp.cc
            M  sql/sp_cache.cc
            M  sql/sp_head.cc
            M  sql/sql_base.cc
            M  sql/sql_class.cc
            M  sql/sql_class.h
            M  sql/sql_lex.cc
            M  sql/sql_lex.h
            M  sql/sql_repl.cc
            M  sql/sql_select.cc
            M  sql/sql_select.h
            M  sql/sql_table.cc
            M  sql/sql_trigger.cc
            M  sql/sql_update.cc
            M  sql/sql_view.cc
            M  sql/table.cc
            M  sql/table.h
            M  storage/archive/ha_archive.cc
            M  storage/csv/ha_tina.cc
            M  storage/innobase/buf/buf0buf.c
            M  storage/innobase/buf/buf0rea.c
            M  storage/innobase/handler/ha_innodb.cc
            M  storage/innobase/include/buf0rea.h
            M  storage/innobase/lock/lock0lock.c
            M  storage/innobase/os/os0file.c
            M  storage/myisam/ft_boolean_search.c
            M  storage/myisam/mi_dynrec.c
            M  storage/myisam/mi_locking.c
            M  storage/ndb/src/common/util/Makefile.am
            M  support-files/mysql.spec.sh
        2497.1293.21 Sven Sandberg	2010-03-03
                    Post-merge fixes in rpl_ndb_binlog_format_errors to fix
                    test failures after 6.0-codebase was merged with 5.1-rep+3.
                    
                    Background:
                    In the fix of BUG#39934 in 5.1-rep+3, errors are generated when
                    binlog_format=row and a statement modifies a table restricted
                    to statement-logging; or if binlog_format=statement and a
                    statement modifies a table limited to row-logging. The check is
                    based on which tables are locked.
                    In the version of 5.1 that BUG#39934 was based on, CREATE TRIGGER
                    did not call lock_tables, so CREATE TRIGGER could not generate
                    the error.
                    In work made concurrently to BUG#39934 in 6.0-codebase, CREATE
                    TRIGGER was changed so that it calls lock_tables.
                    
                    Problem:
                    When the two branches were merged, the test case
                    rpl_ndb.rpl_ndb_binlog_format_errors started to fail, because it
                    invokes CREATE TRIGGER on a statement-only table when
                    binlog_format=ROW.
                    
                    Fix:
                    rpl_ndb_binlog_format_errors doesn't have to use triggers in the
                    place where it fails. All that is important is that it modifies
                    two tables in one statement. Fixed by replacing an INSERT into
                    a table with a trigger by a multi-table UPDATE.
                    
                    The fix is pushed to 5.1-rep+2 since the test was introduced there.
                    
                    See also BUG#50479
             @ mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
                updated result file
             @ mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt
                removed unnecessary option
             @ mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
                Replaced INSERT into table with trigger by multi-table UPDATE.

            M  mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
            M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt
            M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
    2497.1454.16 He Zhenxing	2010-03-14 [merge]
                Auto merge from 5.1 main

        A  mysql-test/include/ctype_utf8mb4.inc
        A  mysql-test/r/ctype_utf8mb4_heap.result
        A  mysql-test/r/ctype_utf8mb4_innodb.result
        A  mysql-test/r/ctype_utf8mb4_myisam.result
        A  mysql-test/r/ctype_utf8mb4_ndb.result
        A  mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
        A  mysql-test/suite/large_tests/t/rpl_slave_net_timeout-slave.opt
        A  mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
        A  mysql-test/suite/perfschema/r/pfs_upgrade.result
        A  mysql-test/suite/perfschema/t/pfs_upgrade.test
        A  mysql-test/suite/rpl/r/rpl_row_utf16.result
        A  mysql-test/suite/rpl/r/rpl_row_utf32.result
        A  mysql-test/suite/rpl/t/rpl_row_utf16.test
        A  mysql-test/suite/rpl/t/rpl_row_utf32.test
        A  mysql-test/suite/sys_vars/r/log_error_func.result
        A  mysql-test/suite/sys_vars/r/log_error_func2.result
        A  mysql-test/suite/sys_vars/r/log_error_func3.result
        A  mysql-test/suite/sys_vars/t/log_error_func.cnf
        A  mysql-test/suite/sys_vars/t/log_error_func.test
        A  mysql-test/suite/sys_vars/t/log_error_func2.cnf
        A  mysql-test/suite/sys_vars/t/log_error_func2.test
        A  mysql-test/suite/sys_vars/t/log_error_func3.test
        A  mysql-test/t/ctype_utf8mb4_heap.test
        A  mysql-test/t/ctype_utf8mb4_innodb.test
        A  mysql-test/t/ctype_utf8mb4_myisam.test
        A  mysql-test/t/ctype_utf8mb4_ndb.test
        M  CMakeLists.txt
        M  COPYING
        M  README
        M  client/client_priv.h
        M  client/mysql.cc
        M  client/mysqladmin.cc
        M  cmake/build_configurations/mysql_release.cmake
        M  cmake/configure.pl
        M  cmake/os/Windows.cmake
        M  cmake/plugin.cmake
        M  config.h.cmake
        M  configure.cmake
        M  configure.in
        M  include/m_ctype.h
        M  include/my_global.h
        M  include/my_pthread.h
        M  include/mysql/psi/mysql_thread.h
        M  libmysql_r/Makefile.am
        M  mysql-test/CMakeLists.txt
        M  mysql-test/collections/default.experimental
        M  mysql-test/include/handler.inc
        M  mysql-test/lib/My/Options.pm
        M  mysql-test/lib/mtr_cases.pm
        M  mysql-test/lib/t/Options.t
        M  mysql-test/lib/v1/mtr_io.pl
        M  mysql-test/lib/v1/mysql-test-run.pl
        M  mysql-test/r/ctype_utf8mb4.result
        M  mysql-test/r/flush.result
        M  mysql-test/r/greedy_optimizer.result
        M  mysql-test/r/handler_innodb.result
        M  mysql-test/r/handler_myisam.result
        M  mysql-test/r/implicit_commit.result
        M  mysql-test/r/lock_multi.result
        M  mysql-test/r/merge.result
        M  mysql-test/r/mysqlbinlog_row_innodb.result
        M  mysql-test/r/mysqlbinlog_row_myisam.result
        M  mysql-test/r/mysqld--help-notwin.result
        M  mysql-test/r/mysqld--help-win.result
        M  mysql-test/r/query_cache.result
        M  mysql-test/r/read_only_innodb.result
        M  mysql-test/r/sp-destruct.result
        M  mysql-test/r/type_timestamp.result
        M  mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
        M  mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt
        M  mysql-test/suite/perfschema/r/dml_setup_instruments.result
        M  mysql-test/suite/perfschema/r/misc.result
        M  mysql-test/suite/perfschema/t/misc.test
        M  mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt
        M  mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt
        M  mysql-test/suite/rpl/t/rpl_packet-master.opt
        M  mysql-test/suite/rpl/t/rpl_packet-slave.opt
        M  mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
        M  mysql-test/suite/rpl/t/rpl_semi_sync.test
        M  mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt
        M  mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
        M  mysql-test/t/cache_innodb-master.opt
        M  mysql-test/t/count_distinct2-master.opt
        M  mysql-test/t/ctype_utf8mb4.test
        M  mysql-test/t/flush.test
        M  mysql-test/t/implicit_commit.test
        M  mysql-test/t/init_connect-master.opt
        M  mysql-test/t/lock_multi.test
        M  mysql-test/t/merge.test
        M  mysql-test/t/multi_update-master.opt
        M  mysql-test/t/multi_update2-master.opt
        M  mysql-test/t/multi_update_tiny_hash-master.opt
        M  mysql-test/t/order_fill_sortbuf-master.opt
        M  mysql-test/t/query_cache.test
        M  mysql-test/t/read_only_innodb.test
        M  mysql-test/t/sp-destruct.test
        M  mysql-test/t/type_timestamp.test
        M  mysys/my_getopt.c
        M  mysys/thr_rwlock.c
        M  netware/my_manage.c
        M  netware/mysql_test_run.c
        M  netware/mysqld_safe.c
        M  plugin/Makefile.am
        M  plugin/semisync/CMakeLists.txt
        M  plugin/semisync/semisync_master.cc
        M  scripts/CMakeLists.txt
        M  scripts/mysql_system_tables.sql
        M  scripts/mysqld_safe.sh
        M  scripts/mysqlhotcopy.sh
        M  sql-bench/Comments/mysql.benchmark
        M  sql-common/client.c
        M  sql/CMakeLists.txt
        M  sql/event_db_repository.cc
        M  sql/event_scheduler.cc
        M  sql/field.cc
        M  sql/ha_ndbcluster.cc
        M  sql/ha_ndbcluster_binlog.cc
        M  sql/ha_partition.cc
        M  sql/item.h
        M  sql/lock.cc
        M  sql/log_event.cc
        M  sql/log_event_old.cc
        M  sql/mdl.cc
        M  sql/mdl.h
        M  sql/mysql_priv.h
        M  sql/mysql_priv.h.pp
        M  sql/mysqld.cc
        M  sql/net_serv.cc
        M  sql/rpl_utility.cc
        M  sql/share/errmsg-utf8.txt
        M  sql/slave.cc
        M  sql/sp_head.cc
        M  sql/sql_acl.cc
        M  sql/sql_base.cc
        M  sql/sql_class.h
        M  sql/sql_delete.cc
        M  sql/sql_handler.cc
        M  sql/sql_insert.cc
        M  sql/sql_load.cc
        M  sql/sql_parse.cc
        M  sql/sql_plugin.cc
        M  sql/sql_prepare.cc
        M  sql/sql_servers.cc
        M  sql/sql_table.cc
        M  sql/sql_udf.cc
        M  sql/sql_view.cc
        M  sql/sql_yacc.yy
        M  sql/sys_vars.cc
        M  sql/tztime.cc
        M  storage/innobase/CMakeLists.txt
        M  storage/myisam/myisamchk.c
        M  storage/perfschema/pfs_engine_table.cc
        M  storage/perfschema/pfs_instr.cc
        M  storage/perfschema/unittest/pfs-t.cc
        M  strings/ctype-mb.c
        M  strings/ctype-uca.c
        M  strings/ctype-ucs2.c
        M  strings/ctype-utf8.c
        M  support-files/my-huge.cnf.sh
        M  support-files/my-large.cnf.sh
        M  support-files/my-medium.cnf.sh
        M  support-files/my-small.cnf.sh
        M  support-files/mysql-multi.server.sh
        M  support-files/mysql.spec.sh
        M  tests/big_record.pl
        M  tests/myisam-big-rows.tst
        M  tests/mysql_client_test.c
    2497.1454.15 Luis Soares	2010-03-08
                BUG#44958: Setting read_only won't succeed if tx is already started in
                different connection
                
                Backporting cset from 6.0 revision id:
                luis.soares@stripped
                
                This bug was opened to report the disabling of test rpl_read_only
                after patch for BUG#989 was pushed and to reenable this test case with
                the appropriate changes.
                                    
                This test case consists of three parts:
                                    
                1. check that the readonly variable is not replicated. The variable is
                   set on the master before any locking takes place. This is safe wrt
                   to the patch for BUG#989.
                                    
                2. check that user root (on conn1) can commit even if 'set
                   read_only=1' is done concurrently (on conn3) just before conn1
                   issues commit. This checks also that other users than root will not
                   be able to commit under the same scenario.
                                    
                3. check that the sql slave thread is able to apply the changes even
                   if read_only is set. This is safe wrt to the patch for BUG#989.
                                  
                The test case now hangs in 2. because it tries to set the flag
                read_only, while there are active changes going on (and mdl locks are
                taken). 
                                    
                The proposed fix addresses this, by changing a little the test case in
                2., so that the read_only flag is set before the changes are
                done. This makes the test not to hang anymore and keeps as close as
                possible the same assertions from before: i) assertion that the SUPER
                user can commit persists; ii) assertion that the non-super user cannot
                commit is changed - since read_only is set before the inserts, now
                when this user tries to insert it will get an error (ie, the check is
                performed earlier - before commit).

        M  mysql-test/suite/rpl/r/rpl_read_only.result
        M  mysql-test/suite/rpl/t/disabled.def
        M  mysql-test/suite/rpl/t/rpl_read_only.test
    2497.1454.14 Luis Soares	2010-03-08
                BUG#44938: Replication fails when optimizing a table used by pending
                transaction.
                
                Backporting cset from 6.0 revision id:
                luis.soares@stripped
                                   
                The original version of rpl_failed_optimize checked that a failed
                optimize operation would not harm replication. It performed two
                checks:
                                     
                  1. Check that failed optimize operations due to timeout (in this
                     case, because it is optimizing a currently used table in other
                     session), will not harm replication.
                                    
                     After patch for BUG#989 was pushed, the test hangs here, due to
                     meta data locks - optimize will block on mdl lock instead of
                     innodb lock, causing the test operations on the other session not
                     to execute. Consequently, the entire test hangs.
                                    
                  2. Check that optimizing a non-existing table will not harm
                     replication. 
                                    
                Due to the change in behavior introduced by patch for BUG#989, this
                fix addresses the blocking issue by removing item 1.

        D  mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
        M  mysql-test/extra/rpl_tests/rpl_failed_optimize.test
        M  mysql-test/suite/rpl/r/rpl_failed_optimize.result
        M  mysql-test/suite/rpl/t/disabled.def
    2497.1454.13 Sven Sandberg	2010-03-03 [merge]
                merged next-mr -> 5.1-rpl-merge
                no conflicts.

        A  mysql-test/include/not_binlog_format_row.inc
        A  mysql-test/r/bug39022.result
        A  mysql-test/r/no_binlog.result
        A  mysql-test/r/partition_debug_sync.result
        A  mysql-test/std_data/bug48449.frm
        A  mysql-test/t/bug39022.test
        A  mysql-test/t/no_binlog.test
        A  mysql-test/t/partition_debug_sync.test
        M  .bzrignore
        M  README
        M  client/mysql.cc
        M  client/mysql_upgrade.c
        M  client/mysqladmin.cc
        M  client/mysqlbinlog.cc
        M  client/mysqlcheck.c
        M  client/mysqldump.c
        M  client/mysqlimport.c
        M  client/mysqlshow.c
        M  client/mysqlslap.c
        M  client/mysqltest.cc
        M  cmd-line-utils/readline/rlmbutil.h
        M  cmd-line-utils/readline/text.c
        M  configure.in
        M  extra/yassl/include/yassl_error.hpp
        M  extra/yassl/src/ssl.cpp
        M  extra/yassl/src/yassl_error.cpp
        M  mysql-test/Makefile.am
        M  mysql-test/collections/default.experimental
        M  mysql-test/extra/rpl_tests/rpl_loaddata.test
        M  mysql-test/include/mtr_warnings.sql
        M  mysql-test/r/archive.result
        M  mysql-test/r/backup.result
        M  mysql-test/r/bigint.result
        M  mysql-test/r/csv.result
        M  mysql-test/r/default.result
        M  mysql-test/r/delete.result
        M  mysql-test/r/fulltext.result
        M  mysql-test/r/func_gconcat.result
        M  mysql-test/r/group_by.result
        M  mysql-test/r/group_min_max.result
        M  mysql-test/r/having.result
        M  mysql-test/r/innodb_mysql.result
        M  mysql-test/r/join.result
        M  mysql-test/r/multi_update.result
        M  mysql-test/r/myisam.result
        M  mysql-test/r/mysqld--help-notwin.result
        M  mysql-test/r/mysqld--help-win.result
        M  mysql-test/r/sp-bugs.result
        M  mysql-test/r/sp_notembedded.result
        M  mysql-test/r/subselect.result
        M  mysql-test/r/type_bit.result
        M  mysql-test/r/view.result
        M  mysql-test/r/view_grant.result
        M  mysql-test/suite/rpl/r/rpl_slow_query_log.result
        M  mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
        M  mysql-test/suite/rpl/t/rpl_slow_query_log.test
        M  mysql-test/suite/sys_vars/r/slow_query_log_func.result
        M  mysql-test/suite/sys_vars/t/slow_query_log_func.test
        M  mysql-test/t/archive.test
        M  mysql-test/t/bigint.test
        M  mysql-test/t/csv.test
        M  mysql-test/t/delete.test
        M  mysql-test/t/fulltext.test
        M  mysql-test/t/func_gconcat.test
        M  mysql-test/t/group_by.test
        M  mysql-test/t/group_min_max.test
        M  mysql-test/t/having.test
        M  mysql-test/t/innodb_mysql.test
        M  mysql-test/t/join.test
        M  mysql-test/t/multi_update.test
        M  mysql-test/t/myisam.test
        M  mysql-test/t/sp-bugs.test
        M  mysql-test/t/sp_notembedded.test
        M  mysql-test/t/subselect.test
        M  mysql-test/t/type_bit.test
        M  mysql-test/t/view.test
        M  mysql-test/t/view_grant.test
        M  mysys/default.c
        M  scripts/Makefile.am
        M  sql/field.cc
        M  sql/ha_partition.cc
        M  sql/item.cc
        M  sql/item.h
        M  sql/item_cmpfunc.h
        M  sql/item_row.cc
        M  sql/item_sum.cc
        M  sql/log_event.cc
        M  sql/log_event_old.cc
        M  sql/mysql_priv.h
        M  sql/mysqld.cc
        M  sql/opt_range.cc
        M  sql/opt_sum.cc
        M  sql/share/Makefile.am
        M  sql/sp_cache.cc
        M  sql/sp_head.cc
        M  sql/sql_base.cc
        M  sql/sql_class.cc
        M  sql/sql_class.h
        M  sql/sql_lex.cc
        M  sql/sql_lex.h
        M  sql/sql_select.cc
        M  sql/sql_select.h
        M  sql/sql_table.cc
        M  sql/sql_trigger.cc
        M  sql/sql_update.cc
        M  sql/sql_view.cc
        M  sql/table.cc
        M  sql/table.h
        M  storage/archive/ha_archive.cc
        M  storage/csv/ha_tina.cc
        M  storage/myisam/ft_boolean_search.c
        M  storage/myisam/mi_dynrec.c
        M  storage/myisam/mi_locking.c
        M  storage/ndb/src/common/util/Makefile.am
        M  support-files/mysql.spec.sh
    2497.1454.12 Luis Soares	2010-03-01 [merge]
                Merge (empty) from mysql-5.1-rep+2.

        2497.1293.20 Luis Soares	2010-03-01
                    Disabled and experiemntal lists maintenance. Added missing entries that
                    are also in mysql-next-mr.

            M  mysql-test/collections/default.experimental
            M  mysql-test/suite/rpl/t/disabled.def
            M  mysql-test/suite/rpl/t/rpl_semi_sync.test
    2497.1454.11 Luis Soares	2010-03-01 [merge]
                Automerge from mysql-next-mr.

        D  mysql-test/suite/sys_vars/r/sql_log_update_basic.result
        D  mysql-test/suite/sys_vars/t/sql_log_update_basic.test
        D  storage/mysql_storage_engine.cmake
        D  unittest/mysys/CMakeLists.txt
        D  unittest/mytap/CMakeLists.txt
        A  BUILD-CMAKE
        A  BUILD/choose_configure.sh
        A  cmake/
        A  cmake/Makefile.am
        A  cmake/abi_check.cmake
        A  cmake/bison.cmake
        A  cmake/build_configurations/
        A  cmake/build_configurations/mysql_release.cmake
        A  cmake/cat.cmake
        A  cmake/character_sets.cmake
        A  cmake/check_minimal_version.cmake
        A  cmake/cmake_parse_arguments.cmake
        A  cmake/configurable_file_content.in
        A  cmake/configure.pl
        A  cmake/cpack_source_ignore_files.cmake
        A  cmake/create_initial_db.cmake.in
        A  cmake/do_abi_check.cmake
        A  cmake/dtrace.cmake
        A  cmake/dtrace_prelink.cmake
        A  cmake/install_layout.cmake
        A  cmake/install_macros.cmake
        A  cmake/libutils.cmake
        A  cmake/make_dist.cmake.in
        A  cmake/merge_archives_unix.cmake.in
        A  cmake/mysql_add_executable.cmake
        A  cmake/mysql_version.cmake
        A  cmake/os/
        A  cmake/os/AIX.cmake
        A  cmake/os/Cygwin.cmake
        A  cmake/os/Darwin.cmake
        A  cmake/os/FreeBSD.cmake
        A  cmake/os/HP-UX.cmake
        A  cmake/os/Linux.cmake
        A  cmake/os/OS400.cmake
        A  cmake/os/SunOS.cmake
        A  cmake/os/Windows.cmake
        A  cmake/os/WindowsCache.cmake
        A  cmake/package_name.cmake
        A  cmake/plugin.cmake
        A  cmake/readline.cmake
        A  cmake/ssl.cmake
        A  cmake/stack_direction.c
        A  cmake/versioninfo.rc.in
        A  cmake/zlib.cmake
        A  cmd-line-utils/libedit/CMakeLists.txt
        A  cmd-line-utils/readline/CMakeLists.txt
        A  config.h.cmake
        A  configure.cmake
        A  include/CMakeLists.txt
        A  man/CMakeLists.txt
        A  mysql-test/CMakeLists.txt
        A  mysql-test/collections/test-bt
        A  mysql-test/collections/test-bt-debug
        A  mysql-test/collections/test-bt-debug-fast
        A  mysql-test/collections/test-bt-fast
        A  mysql-test/include/ctype_datetime.inc
        A  mysql-test/include/ctype_like.inc
        A  mysql-test/include/ctype_numconv.inc
        A  mysql-test/include/have_utf16.inc
        A  mysql-test/include/have_utf32.inc
        A  mysql-test/include/have_utf8mb4.inc
        A  mysql-test/mtr.out-of-source
        A  mysql-test/r/ctype_binary.result
        A  mysql-test/r/ctype_utf16.result
        A  mysql-test/r/ctype_utf16_uca.result
        A  mysql-test/r/ctype_utf32.result
        A  mysql-test/r/ctype_utf32_uca.result
        A  mysql-test/r/ctype_utf8mb4.result
        A  mysql-test/r/have_utf16.require
        A  mysql-test/r/have_utf32.require
        A  mysql-test/r/have_utf8mb4.require
        A  mysql-test/t/ctype_binary.test
        A  mysql-test/t/ctype_utf16.test
        A  mysql-test/t/ctype_utf16_uca.test
        A  mysql-test/t/ctype_utf32.test
        A  mysql-test/t/ctype_utf32_uca.test
        A  mysql-test/t/ctype_utf8mb4.test
        A  plugin/audit_null/CMakeLists.txt
        A  plugin/daemon_example/CMakeLists.txt
        A  plugin/fulltext/CMakeLists.txt
        A  sql-bench/CMakeLists.txt
        A  sql/main.cc
        A  sql/share/CMakeLists.txt
        A  support-files/CMakeLists.txt
        A  unittest/mysys/CMakeLists.txt
        A  unittest/mytap/CMakeLists.txt
        R  mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result => mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result
        R  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt => mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029-master.opt
        R  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test => mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test
        M  BUILD/Makefile.am
        M  BUILD/autorun.sh
        M  CMakeLists.txt
        M  Makefile.am
        M  client/CMakeLists.txt
        M  client/client_priv.h
        M  client/mysql.cc
        M  client/mysqlbinlog.cc
        M  client/mysqldump.c
        M  client/mysqltest.cc
        M  cmd-line-utils/libedit/Makefile.am
        M  cmd-line-utils/readline/Makefile.am
        M  config/ac-macros/character_sets.m4
        M  configure.in
        M  dbug/CMakeLists.txt
        M  extra/CMakeLists.txt
        M  extra/comp_err.c
        M  extra/perror.c
        M  extra/yassl/CMakeLists.txt
        M  extra/yassl/taocrypt/CMakeLists.txt
        M  include/Makefile.am
        M  include/atomic/x86-gcc.h
        M  include/config-win.h
        M  include/keycache.h
        M  include/m_ctype.h
        M  include/my_atomic.h
        M  include/my_global.h
        M  include/my_pthread.h
        M  include/my_sys.h
        M  include/mysql/plugin.h
        M  include/thr_alarm.h
        M  libmysql/CMakeLists.txt
        M  libmysql/libmysql.def
        M  libmysqld/CMakeLists.txt
        M  libmysqld/examples/CMakeLists.txt
        M  libmysqld/lib_sql.cc
        M  man/Makefile.am
        M  mysql-test/Makefile.am
        M  mysql-test/collections/default.experimental
        M  mysql-test/include/cleanup_fake_relay_log.inc
        M  mysql-test/include/default_mysqld.cnf
        M  mysql-test/include/mtr_warnings.sql
        M  mysql-test/include/mysqld--help.inc
        M  mysql-test/include/setup_fake_relay_log.inc
        M  mysql-test/lib/My/ConfigFactory.pm
        M  mysql-test/lib/My/Find.pm
        M  mysql-test/lib/My/SafeProcess.pm
        M  mysql-test/lib/My/SafeProcess/CMakeLists.txt
        M  mysql-test/lib/My/SafeProcess/safe_kill_win.cc
        M  mysql-test/lib/My/SafeProcess/safe_process_win.cc
        M  mysql-test/lib/v1/mysql-test-run.pl
        M  mysql-test/mysql-test-run.pl
        M  mysql-test/r/case.result
        M  mysql-test/r/create.result
        M  mysql-test/r/ctype_cp1251.result
        M  mysql-test/r/ctype_latin1.result
        M  mysql-test/r/ctype_ldml.result
        M  mysql-test/r/ctype_many.result
        M  mysql-test/r/ctype_ucs.result
        M  mysql-test/r/ctype_utf8.result
        M  mysql-test/r/errors.result
        M  mysql-test/r/func_gconcat.result
        M  mysql-test/r/func_str.result
        M  mysql-test/r/func_time.result
        M  mysql-test/r/grant.result
        M  mysql-test/r/innodb_mysql.result
        M  mysql-test/r/locale.result
        M  mysql-test/r/metadata.result
        M  mysql-test/r/mysqlbinlog.result
        M  mysql-test/r/mysqld--help-notwin.result
        M  mysql-test/r/mysqld--help-win.result
        M  mysql-test/r/perror-win.result
        M  mysql-test/r/perror.result
        M  mysql-test/r/ps_2myisam.result
        M  mysql-test/r/ps_3innodb.result
        M  mysql-test/r/ps_4heap.result
        M  mysql-test/r/ps_5merge.result
        M  mysql-test/r/signal.result
        M  mysql-test/r/sp-error.result
        M  mysql-test/r/sp-vars.result
        M  mysql-test/r/sp.result
        M  mysql-test/r/sp_notembedded.result
        M  mysql-test/r/strict.result
        M  mysql-test/r/type_datetime.result
        M  mysql-test/r/type_ranges.result
        M  mysql-test/r/udf.result
        M  mysql-test/r/union.result
        M  mysql-test/r/variables.result
        M  mysql-test/r/view.result
        M  mysql-test/r/warnings.result
        M  mysql-test/std_data/Index.xml
        M  mysql-test/suite/funcs_1/r/storedproc.result
        M  mysql-test/suite/ndb/r/ndb_basic.result
        M  mysql-test/suite/ndb/r/ps_7ndb.result
        M  mysql-test/suite/parts/r/partition_recover_myisam.result
        M  mysql-test/suite/parts/t/partition_recover_myisam.test
        M  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
        M  mysql-test/suite/rpl/t/rpl_semi_sync.test
        M  mysql-test/suite/sys_vars/r/character_set_client_basic.result
        M  mysql-test/suite/sys_vars/r/character_set_connection_basic.result
        M  mysql-test/suite/sys_vars/r/character_set_database_basic.result
        M  mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
        M  mysql-test/suite/sys_vars/r/character_set_results_basic.result
        M  mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
        M  mysql-test/suite/sys_vars/r/lc_time_names_basic.result
        M  mysql-test/suite/sys_vars/r/max_prepared_stmt_count_func.result
        M  mysql-test/suite/sys_vars/t/character_set_client_basic.test
        M  mysql-test/suite/sys_vars/t/character_set_connection_basic.test
        M  mysql-test/suite/sys_vars/t/character_set_database_basic.test
        M  mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test
        M  mysql-test/suite/sys_vars/t/character_set_results_basic.test
        M  mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
        M  mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
        M  mysql-test/suite/sys_vars/t/shared_memory_basic.test
        M  mysql-test/t/bug47671-master.opt
        M  mysql-test/t/ctype_cp1251.test
        M  mysql-test/t/ctype_latin1.test
        M  mysql-test/t/ctype_latin1_de-master.opt
        M  mysql-test/t/ctype_ldml.test
        M  mysql-test/t/ctype_many.test
        M  mysql-test/t/ctype_ucs.test
        M  mysql-test/t/ctype_ucs2_def-master.opt
        M  mysql-test/t/ctype_utf8.test
        M  mysql-test/t/fulltext_plugin.test
        M  mysql-test/t/func_str.test
        M  mysql-test/t/func_time.test
        M  mysql-test/t/innodb_mysql.test
        M  mysql-test/t/loadxml.test
        M  mysql-test/t/mysqlbinlog.test
        M  mysql-test/t/perror.test
        M  mysql-test/t/ps-master.opt
        M  mysql-test/t/show_check-master.opt
        M  mysql-test/t/udf.test
        M  mysql-test/t/union-master.opt
        M  mysql-test/t/variables.test
        M  mysql-test/t/view.test
        M  mysys/CMakeLists.txt
        M  mysys/charset-def.c
        M  mysys/charset.c
        M  mysys/my_create.c
        M  mysys/my_getsystime.c
        M  mysys/my_handler.c
        M  mysys/my_rdtsc.c
        M  mysys/my_winthread.c
        M  mysys/mysys_priv.h
        M  mysys/typelib.c
        M  plugin/audit_null/Makefile.am
        M  plugin/daemon_example/Makefile.am
        M  plugin/fulltext/Makefile.am
        M  plugin/semisync/CMakeLists.txt
        M  regex/CMakeLists.txt
        M  regex/regex2.h
        M  scripts/CMakeLists.txt
        M  scripts/Makefile.am
        M  scripts/mysqld_multi.sh
        M  scripts/mysqld_safe.sh
        M  sql-bench/Makefile.am
        M  sql/CMakeLists.txt*
        M  sql/Makefile.am
        M  sql/field.cc
        M  sql/field.h
        M  sql/handler.cc
        M  sql/item.cc
        M  sql/item.h
        M  sql/item_cmpfunc.cc
        M  sql/item_cmpfunc.h
        M  sql/item_func.cc
        M  sql/item_func.h
        M  sql/item_geofunc.cc
        M  sql/item_geofunc.h
        M  sql/item_strfunc.cc
        M  sql/item_strfunc.h
        M  sql/item_sum.cc
        M  sql/item_timefunc.cc
        M  sql/item_timefunc.h
        M  sql/item_xmlfunc.cc
        M  sql/lex.h
        M  sql/log.cc
        M  sql/my_decimal.cc
        M  sql/mysql_priv.h
        M  sql/mysqld.cc
        M  sql/nt_servc.cc
        M  sql/opt_range.cc
        M  sql/protocol.cc
        M  sql/share/Makefile.am
        M  sql/share/errmsg-utf8.txt
        M  sql/slave.cc
        M  sql/spatial.cc
        M  sql/sql_base.cc
        M  sql/sql_builtin.cc.in
        M  sql/sql_class.h
        M  sql/sql_parse.cc
        M  sql/sql_select.cc
        M  sql/sql_string.cc
        M  sql/sql_table.cc
        M  sql/sql_yacc.yy
        M  sql/sys_vars.cc
        M  sql/time.cc
        M  storage/Makefile.am
        M  storage/archive/CMakeLists.txt
        M  storage/blackhole/CMakeLists.txt
        M  storage/csv/CMakeLists.txt
        M  storage/example/CMakeLists.txt
        M  storage/federated/CMakeLists.txt
        M  storage/heap/CMakeLists.txt
        M  storage/heap/ha_heap.cc
        M  storage/ibmdb2i/CMakeLists.txt
        M  storage/innobase/CMakeLists.txt
        M  storage/myisam/CMakeLists.txt
        M  storage/myisam/ha_myisam.cc
        M  storage/myisammrg/CMakeLists.txt
        M  storage/perfschema/CMakeLists.txt
        M  storage/perfschema/unittest/CMakeLists.txt
        M  strings/CMakeLists.txt
        M  strings/ctype-mb.c
        M  strings/ctype-uca.c
        M  strings/ctype-ucs2.c
        M  strings/ctype-utf8.c
        M  support-files/Makefile.am
        M  tests/CMakeLists.txt
        M  unittest/mytap/tap.c
        M  vio/CMakeLists.txt
        M  win/configure.js
        M  win/create_def_file.js
        M  zlib/CMakeLists.txt
        M  mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result
        M  mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test
    2497.1454.10 Li-Bing.Song@stripped	2010-02-24 [merge]
                Auto Merge

        M  mysql-test/suite/rpl/r/rpl_user.result
        M  mysql-test/suite/rpl/t/rpl_user.test
        M  sql/sql_acl.cc
        2497.1293.19 Li-Bing.Song@stripped	2010-02-24
                    BUG#50172 The 'CREATE USER' statement is binlogged with plaintext password
                    
                    When executing 'CREATE USER' statements, the original queries user input 
                    were binlogged directly. So the plain text passwords user input were binlogged.
                    
                    After this patch, We create a new binlog query with cipher text password.

            M  mysql-test/suite/rpl/r/rpl_user.result
            M  mysql-test/suite/rpl/t/rpl_user.test
            M  sql/sql_acl.cc
    2497.1454.9 Luis Soares	2010-02-21 [merge]
                Automerge (empty): mysql-5.1-rep+2  --> mysql-5.1-rpl-merge.

        2497.1293.18 Luis Soares	2010-02-21 [merge]
                    Automerge: mysql-5.1 --> mysql-5.1-rep+2.

            M  scripts/mysql_install_db.sh
    2497.1454.8 Luis Soares	2010-02-21 [merge]
                Manual merge: mysql-next-mr --> mysql-5.1-rpl-merge.
                
                Conflicts
                =========
                Text conflict in .bzr-mysql/default.conf

        A  mysql-test/r/comment_column.result
        A  mysql-test/r/comment_column2.result
        A  mysql-test/r/comment_index.result
        A  mysql-test/r/comment_table.result
        A  mysql-test/t/comment_column.test
        A  mysql-test/t/comment_column2.test
        A  mysql-test/t/comment_index.test
        A  mysql-test/t/comment_table.test
        R  mysql-test/r/variables+c.result => mysql-test/r/variables_community.result
        R  mysql-test/t/variables+c.test => mysql-test/t/variables_community.test
        M  client/mysqltest.cc
        M  include/my_base.h
        M  include/mysql_com.h
        M  mysql-test/include/handler.inc
        M  mysql-test/include/mtr_warnings.sql
        M  mysql-test/lib/My/SafeProcess.pm
        M  mysql-test/lib/My/SafeProcess/safe_process_win.cc
        M  mysql-test/lib/mtr_cases.pm
        M  mysql-test/lib/mtr_gprof.pl
        M  mysql-test/lib/mtr_misc.pl
        M  mysql-test/lib/mtr_report.pm
        M  mysql-test/lib/mtr_stress.pl
        M  mysql-test/lib/v1/mtr_stress.pl
        M  mysql-test/lib/v1/mysql-test-run.pl
        M  mysql-test/mysql-test-run.pl
        M  mysql-test/r/alter_table.result
        M  mysql-test/r/analyze.result
        M  mysql-test/r/compress.result
        M  mysql-test/r/create.result
        M  mysql-test/r/ctype_mb.result
        M  mysql-test/r/fulltext.result
        M  mysql-test/r/grant4.result
        M  mysql-test/r/heap.result
        M  mysql-test/r/heap_btree.result
        M  mysql-test/r/heap_hash.result
        M  mysql-test/r/information_schema.result
        M  mysql-test/r/key.result
        M  mysql-test/r/mdl_sync.result
        M  mysql-test/r/merge.result
        M  mysql-test/r/mix2_myisam.result
        M  mysql-test/r/myisam.result
        M  mysql-test/r/mysqldump.result
        M  mysql-test/r/mysqltest.result
        M  mysql-test/r/named_pipe.result
        M  mysql-test/r/partition.result
        M  mysql-test/r/ps_1general.result
        M  mysql-test/r/ps_ddl.result
        M  mysql-test/r/repair.result
        M  mysql-test/r/select.result
        M  mysql-test/r/shm.result
        M  mysql-test/r/show_check.result
        M  mysql-test/r/sp.result
        M  mysql-test/r/ssl.result
        M  mysql-test/r/ssl_compress.result
        M  mysql-test/r/strict.result
        M  mysql-test/r/type_ranges.result
        M  mysql-test/r/view.result
        M  mysql-test/suite/binlog/r/binlog_stm_blackhole.result
        M  mysql-test/suite/funcs_1/r/is_columns.result
        M  mysql-test/suite/funcs_1/r/is_columns_is.result
        M  mysql-test/suite/funcs_1/r/is_statistics.result
        M  mysql-test/suite/funcs_1/r/is_statistics_is.result
        M  mysql-test/suite/funcs_1/r/is_statistics_mysql.result
        M  mysql-test/suite/funcs_1/r/is_table_constraints.result
        M  mysql-test/suite/funcs_1/r/is_tables.result
        M  mysql-test/suite/funcs_1/r/storedproc.result
        M  mysql-test/suite/ndb/r/ndb_alter_table3.result
        M  mysql-test/suite/ndb/r/ndb_basic.result
        M  mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result
        M  mysql-test/suite/sys_vars/r/myisam_stats_method_func.result
        M  mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
        M  mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
        M  mysql-test/t/mysqltest.test
        M  mysql-test/t/partition_innodb_semi_consistent.test
        M  mysql-test/t/strict.test
        M  scripts/mysql_install_db.sh
        M  sql/handler.h
        M  sql/mysql_priv.h
        M  sql/share/errmsg-utf8.txt
        M  sql/sql_show.cc
        M  sql/sql_table.cc
        M  sql/sql_yacc.yy
        M  sql/structs.h
        M  sql/table.cc
        M  sql/unireg.cc
    2497.1454.7 Luis Soares	2010-02-20 [merge]
                Automerge: mysql-next-mr --> mysql-5.1-rpl-merge.

        D  mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
        D  mysql-test/suite/sys_vars/t/table_lock_wait_timeout_basic.test
        D  mysql-test/t/partition_innodb-master.opt
        A  mysql-test/extra/binlog_tests/drop_table.test
        A  mysql-test/include/ctype_utf8_table.inc
        A  mysql-test/include/implicit_commit_helper.inc
        A  mysql-test/r/implicit_commit.result
        A  mysql-test/r/innodb_mysql_lock.result
        A  mysql-test/r/innodb_mysql_sync.result
        A  mysql-test/r/mdl_sync.result
        A  mysql-test/r/merge_recover.result
        A  mysql-test/r/sp-lock.result
        A  mysql-test/r/truncate_coverage.result
        A  mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
        A  mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result
        A  mysql-test/suite/binlog/t/binlog_row_drop_tbl.test
        A  mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test
        A  mysql-test/suite/rpl/r/rpl_view_multi.result
        A  mysql-test/suite/rpl/t/rpl_view_multi.test
        A  mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
        A  mysql-test/suite/sys_vars/t/lock_wait_timeout_basic.test
        A  mysql-test/t/implicit_commit.test
        A  mysql-test/t/innodb_mysql_lock-master.opt
        A  mysql-test/t/innodb_mysql_lock.test
        A  mysql-test/t/innodb_mysql_sync.test
        A  mysql-test/t/mdl_sync.test
        A  mysql-test/t/merge_recover-master.opt
        A  mysql-test/t/merge_recover.test
        A  mysql-test/t/sp-lock.test
        A  mysql-test/t/truncate_coverage.test
        A  sql/mdl.cc
        A  sql/mdl.h
        A  sql/sql_plist.h
        A  sql/transaction.cc
        A  sql/transaction.h
        M  .bzrignore
        M  client/Makefile.am
        M  include/m_ctype.h
        M  include/my_base.h
        M  include/my_global.h
        M  include/my_pthread.h
        M  include/my_sys.h
        M  include/thr_lock.h
        M  libmysqld/CMakeLists.txt
        M  libmysqld/Makefile.am
        M  mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
        M  mysql-test/extra/rpl_tests/rpl_innodb.test
        M  mysql-test/include/commit.inc
        M  mysql-test/include/handler.inc
        M  mysql-test/include/mix1.inc
        M  mysql-test/include/mix2.inc
        M  mysql-test/include/mtr_warnings.sql
        M  mysql-test/lib/v1/mtr_report.pl
        M  mysql-test/r/commit_1innodb.result
        M  mysql-test/r/create.result
        M  mysql-test/r/ctype_cp932_binlog_stm.result
        M  mysql-test/r/ctype_eucjpms.result
        M  mysql-test/r/ctype_sjis.result
        M  mysql-test/r/ctype_ujis.result
        M  mysql-test/r/debug_sync.result
        M  mysql-test/r/drop.result
        M  mysql-test/r/drop_debug.result
        M  mysql-test/r/flush.result
        M  mysql-test/r/flush_block_commit.result
        M  mysql-test/r/flush_block_commit_notembedded.result
        M  mysql-test/r/flush_table.result
        M  mysql-test/r/handler_innodb.result
        M  mysql-test/r/handler_myisam.result
        M  mysql-test/r/information_schema.result
        M  mysql-test/r/innodb-lock.result
        M  mysql-test/r/innodb.result
        M  mysql-test/r/innodb_mysql.result
        M  mysql-test/r/kill.result
        M  mysql-test/r/lock.result
        M  mysql-test/r/lock_multi.result
        M  mysql-test/r/lock_sync.result
        M  mysql-test/r/lowercase_table2.result
        M  mysql-test/r/merge.result
        M  mysql-test/r/mix2_myisam.result
        M  mysql-test/r/mysqld--help-notwin.result
        M  mysql-test/r/mysqld--help-win.result
        M  mysql-test/r/not_embedded_server.result
        M  mysql-test/r/partition.result
        M  mysql-test/r/partition_column_prune.result
        M  mysql-test/r/partition_innodb.result
        M  mysql-test/r/partition_innodb_semi_consistent.result
        M  mysql-test/r/partition_pruning.result
        M  mysql-test/r/partition_sync.result
        M  mysql-test/r/ps.result
        M  mysql-test/r/ps_ddl.result
        M  mysql-test/r/ps_ddl1.result
        M  mysql-test/r/repair.result
        M  mysql-test/r/schema.result
        M  mysql-test/r/sp-error.result
        M  mysql-test/r/sp-threads.result
        M  mysql-test/r/sp.result
        M  mysql-test/r/trigger.result
        M  mysql-test/r/truncate.result
        M  mysql-test/r/variables.result
        M  mysql-test/r/view.result
        M  mysql-test/r/view_grant.result
        M  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
        M  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
        M  mysql-test/suite/binlog/t/binlog_stm_row.test
        M  mysql-test/suite/funcs_1/datadict/processlist_val.inc
        M  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
        M  mysql-test/suite/funcs_1/r/processlist_val_ps.result
        M  mysql-test/suite/ndb/r/ndb_index_ordered.result
        M  mysql-test/suite/ndb/t/disabled.def
        M  mysql-test/suite/ndb/t/ndb_index_ordered.test
        M  mysql-test/suite/parts/r/partition_special_innodb.result
        M  mysql-test/suite/parts/t/partition_special_innodb.test
        M  mysql-test/suite/rpl/r/rpl_mixed_row_innodb.result
        M  mysql-test/suite/rpl/r/rpl_sp.result
        M  mysql-test/suite/rpl/r/rpl_stm_innodb.result
        M  mysql-test/suite/rpl/r/rpl_stm_loadfile.result
        M  mysql-test/suite/rpl/r/rpl_trigger.result
        M  mysql-test/suite/rpl/t/disabled.def
        M  mysql-test/suite/rpl/t/rpl_killed_ddl.test
        M  mysql-test/suite/rpl/t/rpl_sp.test
        M  mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
        M  mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
        M  mysql-test/suite/sys_vars/r/autocommit_func.result
        M  mysql-test/suite/sys_vars/r/concurrent_insert_func.result
        M  mysql-test/suite/sys_vars/r/delayed_insert_limit_func.result
        M  mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_func.result
        M  mysql-test/suite/sys_vars/r/sql_low_priority_updates_func.result
        M  mysql-test/suite/sys_vars/t/autocommit_func.test
        M  mysql-test/suite/sys_vars/t/concurrent_insert_func.test
        M  mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test
        M  mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_func.test
        M  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test
        M  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test
        M  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test
        M  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test
        M  mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
        M  mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
        M  mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
        M  mysql-test/t/create.test
        M  mysql-test/t/ctype_cp932_binlog_stm.test
        M  mysql-test/t/ctype_eucjpms.test
        M  mysql-test/t/ctype_sjis.test
        M  mysql-test/t/ctype_ujis.test
        M  mysql-test/t/debug_sync.test
        M  mysql-test/t/delayed.test
        M  mysql-test/t/disabled.def
        M  mysql-test/t/drop.test
        M  mysql-test/t/drop_debug.test
        M  mysql-test/t/flush.test
        M  mysql-test/t/flush_block_commit.test
        M  mysql-test/t/flush_block_commit_notembedded.test
        M  mysql-test/t/flush_table.test
        M  mysql-test/t/information_schema.test
        M  mysql-test/t/innodb-lock.test
        M  mysql-test/t/innodb.test
        M  mysql-test/t/insert_notembedded.test
        M  mysql-test/t/kill.test
        M  mysql-test/t/lock.test
        M  mysql-test/t/lock_multi.test
        M  mysql-test/t/lock_sync.test
        M  mysql-test/t/lowercase_table2.test
        M  mysql-test/t/merge-big.test
        M  mysql-test/t/merge.test
        M  mysql-test/t/multi_update.test
        M  mysql-test/t/not_embedded_server.test
        M  mysql-test/t/partition.test
        M  mysql-test/t/partition_innodb.test
        M  mysql-test/t/partition_innodb_semi_consistent.test
        M  mysql-test/t/partition_sync.test
        M  mysql-test/t/ps.test
        M  mysql-test/t/ps_ddl.test
        M  mysql-test/t/ps_ddl1.test
        M  mysql-test/t/query_cache_28249.test
        M  mysql-test/t/read_only_innodb.test
        M  mysql-test/t/repair.test
        M  mysql-test/t/schema.test
        M  mysql-test/t/sp-error.test
        M  mysql-test/t/sp.test
        M  mysql-test/t/sp_notembedded.test
        M  mysql-test/t/sp_sync.test
        M  mysql-test/t/status.test
        M  mysql-test/t/trigger.test
        M  mysql-test/t/trigger_notembedded.test
        M  mysql-test/t/truncate.test
        M  mysql-test/t/variables.test
        M  mysql-test/t/view.test
        M  mysql-test/t/view_grant.test
        M  mysql-test/t/xa.test
        M  mysys/hash.c
        M  mysys/my_static.c
        M  mysys/thr_lock.c
        M  sql/CMakeLists.txt
        M  sql/Makefile.am
        M  sql/event_db_repository.cc
        M  sql/events.cc
        M  sql/field.h
        M  sql/ha_ndbcluster.cc
        M  sql/ha_ndbcluster_binlog.cc
        M  sql/ha_partition.cc
        M  sql/ha_partition.h
        M  sql/handler.cc
        M  sql/handler.h
        M  sql/lex.h
        M  sql/lock.cc
        M  sql/log.cc
        M  sql/log_event.cc
        M  sql/log_event_old.cc
        M  sql/mysql_priv.h
        M  sql/mysqld.cc
        M  sql/rpl_injector.cc
        M  sql/rpl_rli.cc
        M  sql/rpl_rli.h
        M  sql/set_var.cc
        M  sql/share/errmsg-utf8.txt
        M  sql/slave.cc
        M  sql/sp.cc
        M  sql/sp.h
        M  sql/sp_cache.cc
        M  sql/sp_cache.h
        M  sql/sp_head.cc
        M  sql/sp_head.h
        M  sql/sql_acl.cc
        M  sql/sql_base.cc
        M  sql/sql_binlog.cc
        M  sql/sql_cache.cc
        M  sql/sql_class.cc
        M  sql/sql_class.h
        M  sql/sql_cursor.cc
        M  sql/sql_db.cc
        M  sql/sql_delete.cc
        M  sql/sql_do.cc
        M  sql/sql_handler.cc
        M  sql/sql_help.cc
        M  sql/sql_insert.cc
        M  sql/sql_lex.h
        M  sql/sql_list.h
        M  sql/sql_load.cc
        M  sql/sql_parse.cc
        M  sql/sql_partition.cc
        M  sql/sql_plugin.cc
        M  sql/sql_prepare.cc
        M  sql/sql_profile.cc
        M  sql/sql_profile.h
        M  sql/sql_rename.cc
        M  sql/sql_select.cc
        M  sql/sql_servers.cc
        M  sql/sql_show.cc
        M  sql/sql_table.cc
        M  sql/sql_test.cc
        M  sql/sql_trigger.cc
        M  sql/sql_trigger.h
        M  sql/sql_udf.cc
        M  sql/sql_update.cc
        M  sql/sql_view.cc
        M  sql/sql_yacc.yy
        M  sql/sys_vars.cc
        M  sql/table.cc
        M  sql/table.h
        M  sql/tztime.cc
        M  storage/myisam/ha_myisam.cc
        M  storage/myisammrg/ha_myisammrg.cc
        M  storage/myisammrg/ha_myisammrg.h
        M  storage/myisammrg/myrg_extra.c
        M  storage/perfschema/pfs_engine_table.cc
        M  strings/ctype-cp932.c
        M  strings/ctype-eucjpms.c
        M  strings/ctype-sjis.c
        M  strings/ctype-ujis.c
        M  tests/mysql_client_test.c
        M  zlib/CMakeLists.txt
    2497.1454.6 Luis Soares	2010-02-17 [merge]
                Null-merge from mysql-5.1-rep+2 into mysql-5.1-rpl-merge.

        2497.1293.17 Luis Soares	2010-02-17 [merge]
                    BUG#46364: Fix for binlog.binlog_switch_inside_trans test failure 
                               in mysql-5.1-rep+2.
                    
                    Merged Alfranio's post-merge fix.

            M  sql/set_var.cc
            M  sql/set_var.h
        2497.1455.1 Alfranio Correia	2010-02-17
                    Post-merge fix that prevents changing the variable binlog_direct_non_trans_update
                    while in a transaction's context or executing a stored function.
             @ sql/set_var.cc
                Added the methods sys_var_thd_binlog_direct::check and sys_var_thd_binlog_direct::is_readonly
             @ sql/set_var.h
                Added the class sys_var_thd_binlog_direct that inherits from sys_var_thd_bool.

            M  sql/set_var.cc
            M  sql/set_var.h
    2497.1454.5 Luis Soares	2010-02-15
                Revert the conflict resolution from revision:
                revid:luis.soares@stripped

        M  sql/log_event.cc
    2497.1454.4 Luis Soares	2010-02-15 [merge]
                Manual merge from mysql-5.1-rep+2 into mysql-5.1-rpl-merge.
                
                Conflicts
                =========
                  Text conflict in sql/log_event.cc

        M  sql/log_event.cc
        2497.1293.16 Luis Soares	2010-02-15
                    Ported BUG#50473 and BUG#50474 to mysql-5.1-rep+2.
                    
                    revid:luis.soares@stripped
                    
                    Conflicts
                    =========
                      Text conflict in sql/log_event.cc

            M  mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
            M  mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
            M  mysql-test/suite/rpl/t/rpl_sync.test
            M  sql/log_event.cc
        2497.1293.15 Luis Soares	2010-02-15
                    Port of BUG#51009 fix into mysql-5.1-rep+2 tree.
                    
                    Fix was found here: http://tinyurl.com/yesanuv

            M  configure.in
    2497.1454.3 Luis Soares	2010-02-14 [merge]
                Automerge from mysql-next-mr.

        A  mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_file_format_check_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_old_blocks_pct_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_old_blocks_time_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_read_ahead_threshold_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_read_io_threads_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_replication_delay_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_spin_wait_delay_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_stats_on_metadata_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_stats_sample_pages_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_version_basic.result
        A  mysql-test/suite/sys_vars/r/innodb_write_io_threads_basic.result
        A  mysql-test/suite/sys_vars/r/rpl_semi_sync_master_enabled_basic.result
        A  mysql-test/suite/sys_vars/r/rpl_semi_sync_master_timeout_basic.result
        A  mysql-test/suite/sys_vars/r/rpl_semi_sync_master_trace_level_basic.result
        A  mysql-test/suite/sys_vars/r/rpl_semi_sync_master_wait_no_slave_basic.result
        A  mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_enabled_basic.result
        A  mysql-test/suite/sys_vars/r/rpl_semi_sync_slave_trace_level_basic.result
        A  mysql-test/suite/sys_vars/t/all_vars-master.opt
        A  mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_file_format_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_file_format_check_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_old_blocks_pct_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_old_blocks_time_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_read_ahead_threshold_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_read_io_threads_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_replication_delay_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_spin_wait_delay_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_stats_on_metadata_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_stats_sample_pages_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_version_basic.test
        A  mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.test
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic-master.opt
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_enabled_basic.test
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic-master.opt
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_timeout_basic.test
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic-master.opt
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_trace_level_basic.test
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic-master.opt
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_master_wait_no_slave_basic.test
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic-master.opt
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_enabled_basic.test
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic-master.opt
        A  mysql-test/suite/sys_vars/t/rpl_semi_sync_slave_trace_level_basic.test
        M  mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
        M  mysql-test/suite/sys_vars/r/last_insert_id_basic.result
        M  mysql-test/suite/sys_vars/r/lc_messages_basic.result
        M  mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
        M  mysql-test/suite/sys_vars/r/lower_case_file_system_basic.result
        M  mysql-test/suite/sys_vars/r/lower_case_table_names_basic.result
        M  mysql-test/suite/sys_vars/r/max_join_size_basic.result
        M  mysql-test/suite/sys_vars/r/old_alter_table_basic.result
        M  mysql-test/suite/sys_vars/r/optimizer_switch_basic.result
        M  mysql-test/suite/sys_vars/r/profiling_basic.result
        M  mysql-test/suite/sys_vars/r/profiling_history_size_basic.result
        M  mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result
        M  mysql-test/suite/sys_vars/r/rand_seed1_basic.result
        M  mysql-test/suite/sys_vars/r/rand_seed2_basic.result
        M  mysql-test/suite/sys_vars/r/relay_log_recovery_basic.result
        M  mysql-test/suite/sys_vars/r/sql_log_update_basic.result
        M  mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
        M  mysql-test/suite/sys_vars/r/sql_select_limit_basic.result
        M  mysql-test/suite/sys_vars/r/thread_cache_size_basic.result
        M  mysql-test/suite/sys_vars/t/all_vars.test
        M  mysql-test/suite/sys_vars/t/last_insert_id_basic.test
        M  mysql-test/suite/sys_vars/t/lc_messages_basic.test
        M  mysql-test/suite/sys_vars/t/log_slow_queries_basic.test
        M  mysql-test/suite/sys_vars/t/lower_case_file_system_basic.test
        M  mysql-test/suite/sys_vars/t/lower_case_table_names_basic.test
        M  mysql-test/suite/sys_vars/t/max_join_size_basic.test
        M  mysql-test/suite/sys_vars/t/old_alter_table_basic.test
        M  mysql-test/suite/sys_vars/t/optimizer_switch_basic.test
        M  mysql-test/suite/sys_vars/t/profiling_basic.test
        M  mysql-test/suite/sys_vars/t/profiling_history_size_basic.test
        M  mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test
        M  mysql-test/suite/sys_vars/t/rand_seed1_basic.test
        M  mysql-test/suite/sys_vars/t/rand_seed2_basic.test
        M  mysql-test/suite/sys_vars/t/relay_log_recovery_basic.test
        M  mysql-test/suite/sys_vars/t/sql_log_update_basic.test
        M  mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test
        M  mysql-test/suite/sys_vars/t/sql_select_limit_basic.test
        M  mysql-test/suite/sys_vars/t/thread_cache_size_basic.test
        M  support-files/mysql.spec.sh
    2497.1454.2 Luis Soares	2010-02-14 [merge]
                Automerge from mysql-5.1-rep+2 (empty).

        2497.1293.14 Luis Soares	2010-02-14 [merge]
                    Automerge from mysql-5.1-rep+3.

            A  mysql-test/suite/binlog/r/binlog_stm_user_variables.result
            A  mysql-test/suite/binlog/t/binlog_stm_user_variables.test
            A  mysql-test/suite/rpl/r/rpl_stm_user_variables.result
            A  mysql-test/suite/rpl/t/rpl_stm_user_variables.test
            M  mysql-test/suite/rpl/r/rpl_slave_skip.result
            M  sql/log.cc
            M  sql/log_event.cc
            M  sql/log_event.h
    2497.1454.1 Luis Soares	2010-02-14 [merge]
                Manual merge from mysql-5.1-rep+2.
                
                Almost a null merge (as there was only mysql-5.1 csets missing
                in mysql-5.1-rpl-merge, which had been merged through mysql-next-mr
                already).
                
                It's not a null-merge because I have ported some changes to test
                cases that were done while merging from mysql-5.1 into 
                mysql-5.1-rep+2. These are csets useful in next-mr as well.

        D  mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt
        M  mysql-test/suite/binlog/r/binlog_unsafe.result
        M  mysql-test/suite/rpl/t/rpl_bug41902.test
    2497.1293.13 Luis Soares	2010-02-14
                Fixes for rpl_heartbeat_basic test case. Ported BUG#50397 and BUG#50767
                csets (the former one was fully ported, the latter only partially ported).

        M  mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
        M  mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
    2497.1293.12 Luis Soares	2010-02-14
                Fixing rpl_bug41902.test warnings.
                
                Moved mtr.add_suppression to the top of the test file.
                Forced a sync_slave_with_master before continuing with the
                test case.

        M  mysql-test/suite/rpl/t/rpl_bug41902.test
    2497.1293.11 Luis Soares	2010-02-13
                Post-merge fixes for several test cases.
                
                 - log_state
                   Updated result file with proper deprecation version.
                
                 - binlog_write_error
                   Test case shall not run in row mode now. Change according
                   to previous merge from mysql-5.1-rep+2 --> mysql-5.1-rpl-merge,
                   according to annotate:
                     revid:alfranio.correia@stripped
                
                 - rpl_misc_functions
                 - rpl_nondeterministic_functions
                   Updated the assertion.

        M  mysql-test/r/log_state.result
        M  mysql-test/suite/binlog/t/binlog_write_error.test
        M  mysql-test/suite/rpl/r/rpl_misc_functions.result
        M  mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result
        M  mysql-test/suite/rpl/t/rpl_misc_functions.test
        M  mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test
    2497.1293.10 Luis Soares	2010-02-13
                Post-merge fix for rpl_loaddata_concurrent test.
                
                Cherrypicked the changes to rpl_loaddata_concurrent test
                from a previous mysql-5.1-rep+2 --> mysql-5.1-rpl-merge
                merge.
                
                The reason to cherrypick this from mysql-next-mr is because
                that merge split the test case over two files, thence we
                need to fetch the file-ids so that we won't run into 
                contents conflicts when merging this branch upwards in the
                future.
                
                cset picked:
                  alfranio.correia@stripped

        A  mysql-test/suite/rpl/r/rpl_row_loaddata_concurrent.result
        A  mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test
        R  mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result => mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
        R  mysql-test/suite/rpl/t/rpl_loaddata_concurrent.test => mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test
        M  mysql-test/extra/rpl_tests/rpl_loaddata.test
        M  mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
        M  mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test
    2497.1293.9 Luis Soares	2010-02-13
                Fixes for BUG#46364 merge from mysql-5.1.
                
                BUG#46364 has two distinct patches, one for 5.1 and one for
                celosia. Since mysql-5.1-rep+2 is a 5.1 GA codebase tree with
                extra replication features that are on 5.5, we need to revert the
                patch from 5.1 and apply the patch pushed to 5.5.
                
                However, one cannot do this straightfoward because the patch
                pushed to 5.5 relies on features that only exist on 5.5 and not
                on a 5.1 GA codebase. So we actually need parts of the patch from
                5.1 and part of the patch from 5.5.
                
                We fix this by merging the cset from 5.5 and keeping the common
                parts of the 5.1 patch. The extra parts of the patchs from 5.1
                and 5.5 are removed. The merge was done by cherrypicking the 5.5
                cset so that the files added in mysql-5.1-rep+2 tree keep the
                same fileid (avoids file conflicts in future merges, when merging
                this tree to mysql-next-mr/trunk).
                
                cset used from 5.5 was:
                alik@stripped
                
                command:
                  bzr merge -c alik@stripped
                
                Conflicts
                =========
                  Text conflict in mysql-test/include/default_mysqld.cnf
                  Text conflict in sql/log.cc
                  Contents conflict in sql/share/errmsg-utf8.txt
                  Text conflict in sql/share/errmsg.txt
                  Contents conflict in sql/sys_vars.cc

        D  mysql-test/suite/rpl/r/rpl_stm_binlog_direct.result
        D  mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt
        D  mysql-test/suite/rpl/t/rpl_stm_binlog_direct.test
        A  mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_basic.result
        A  mysql-test/suite/sys_vars/t/binlog_direct_non_transactional_updates_basic.test
        R  mysql-test/suite/binlog/r/binlog_format_switch_inside_trans.result => mysql-test/suite/binlog/r/binlog_switch_inside_trans.result
        R  mysql-test/suite/binlog/t/binlog_format_switch_inside_trans.test => mysql-test/suite/binlog/t/binlog_switch_inside_trans.test
        M  mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
        M  mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
        M  mysql-test/extra/rpl_tests/rpl_mixing_engines.test
        M  mysql-test/include/default_mysqld.cnf
        M  mysql-test/suite/binlog/r/binlog_multi_engine.result
        M  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
        M  mysql-test/suite/ndb/r/ndb_binlog_format.result
        M  mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
        M  mysql-test/suite/rpl/r/rpl_concurrency_error.result
        M  mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
        M  mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
        M  mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
        M  mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
        M  mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
        M  mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
        M  mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
        M  mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
        M  mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
        M  mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
        M  sql/log.cc
        M  sql/log.h
        M  sql/share/errmsg.txt
        M  support-files/my-small.cnf.sh
        M  mysql-test/suite/binlog/r/binlog_switch_inside_trans.result
        M  mysql-test/suite/binlog/t/binlog_switch_inside_trans.test
    2497.1293.8 Luis Soares	2010-02-12 [merge]
                Manual merge from mysql-5.1.
                
                Conflicts
                =========
                
                  Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test
                  Conflict adding file mysql-test/extra/rpl_tests/rpl_mixing_engines.inc.  Moved existing file to mysql-test/extra/rpl_tests/rpl_mixing_engines.inc.moved.
                  Text conflict in mysql-test/extra/rpl_tests/rpl_row_func003.test
                  Text conflict in mysql-test/include/setup_fake_relay_log.inc
                  Text conflict in mysql-test/r/mysqlbinlog.result
                  Text conflict in mysql-test/suite/binlog/r/binlog_killed_simulate.result
                  Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
                  Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result
                  Text conflict in mysql-test/suite/binlog/t/binlog_unsafe.test
                  Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
                  Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
                  Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_map.result
                  Text conflict in mysql-test/suite/rpl/r/rpl_sp.result
                  Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
                  Text conflict in mysql-test/suite/rpl/t/rpl_optimize.test
                  Text conflict in mysql-test/t/mysqlbinlog.test
                  Text conflict in sql/event_db_repository.cc
                  Text conflict in sql/events.cc
                  Text conflict in sql/log.cc
                  Text conflict in sql/log_event.cc
                  Text conflict in sql/log_event_old.cc
                  Text conflict in sql/mysql_priv.h
                  Text conflict in sql/mysqld.cc
                  Text conflict in sql/rpl_utility.h
                  Text conflict in sql/set_var.cc
                  Text conflict in sql/sp.cc
                  Text conflict in sql/sql_acl.cc
                  Text conflict in sql/sql_base.cc
                  Text conflict in sql/sql_db.cc
                  Text conflict in sql/sql_delete.cc
                  Text conflict in sql/sql_insert.cc
                  Text conflict in sql/sql_load.cc
                  Text conflict in sql/sql_table.cc
                  Text conflict in sql/sql_udf.cc
                  Text conflict in sql/sql_update.cc
                  Text conflict in sql/sql_view.cc
                  Text conflict in sql/sql_yacc.yy

        D  mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
        A  mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
        A  mysql-test/extra/rpl_tests/rpl_set_null.test
        A  mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test
        A  mysql-test/include/binlog_inject_error.inc
        A  mysql-test/include/truncate_file.inc
        A  mysql-test/r/innodb-autoinc-44030.result
        A  mysql-test/r/sp_sync.result
        A  mysql-test/std_data/bug47142_master-bin.000001
        A  mysql-test/suite/binlog/r/binlog_write_error.result
        A  mysql-test/suite/binlog/t/binlog_write_error.test
        A  mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result
        A  mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test
        A  mysql-test/suite/ndb/r/ndb_tmp_table_and_DDL.result
        A  mysql-test/suite/ndb/t/ndb_tmp_table_and_DDL.test
        A  mysql-test/suite/rpl/r/rpl_geometry.result
        A  mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result
        A  mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
        A  mysql-test/suite/rpl/r/rpl_set_null_innodb.result
        A  mysql-test/suite/rpl/r/rpl_set_null_myisam.result
        A  mysql-test/suite/rpl/r/rpl_stm_binlog_direct.result
        A  mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
        A  mysql-test/suite/rpl/t/rpl_geometry.test
        A  mysql-test/suite/rpl/t/rpl_loaddata_concurrent.test
        A  mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
        A  mysql-test/suite/rpl/t/rpl_set_null_innodb.test
        A  mysql-test/suite/rpl/t/rpl_set_null_myisam.test
        A  mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt
        A  mysql-test/suite/rpl/t/rpl_stm_binlog_direct.test
        A  mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
        A  mysql-test/suite/rpl_ndb/r/rpl_ndb_set_null.result
        A  mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test
        A  mysql-test/t/innodb-autoinc-44030.test
        A  mysql-test/t/partition_innodb-master.opt
        A  mysql-test/t/sp_sync.test
        R  mysql-test/suite/binlog/r/binlog_tbl_metadata.result => mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result
        R  mysql-test/suite/binlog/t/binlog_tbl_metadata.test => mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
        M  .bzr-mysql/default.conf
        M  client/client_priv.h
        M  client/mysql.cc
        M  client/mysql_upgrade.c
        M  client/mysqladmin.cc
        M  client/mysqlbinlog.cc
        M  client/mysqldump.c
        M  configure.in
        M  extra/yassl/taocrypt/include/asn.hpp
        M  extra/yassl/taocrypt/src/asn.cpp
        M  include/config-win.h
        M  include/m_string.h
        M  include/my_global.h
        M  include/my_no_pthread.h
        M  include/my_pthread.h
        M  include/my_stacktrace.h
        M  include/my_sys.h
        M  include/myisam.h
        M  libmysql/libmysql.c
        M  mysql-test/collections/default.experimental
        M  mysql-test/extra/rpl_tests/rpl_loaddata.test
        M  mysql-test/extra/rpl_tests/rpl_row_func003.test
        M  mysql-test/include/kill_query.inc
        M  mysql-test/include/setup_fake_relay_log.inc
        M  mysql-test/lib/v1/mysql-test-run.pl
        M  mysql-test/mysql-test-run.pl
        M  mysql-test/r/alter_table.result
        M  mysql-test/r/bug46080.result*
        M  mysql-test/r/count_distinct.result
        M  mysql-test/r/create.result
        M  mysql-test/r/ctype_ucs.result
        M  mysql-test/r/ctype_utf8.result
        M  mysql-test/r/delete.result
        M  mysql-test/r/fulltext.result
        M  mysql-test/r/fulltext_order_by.result
        M  mysql-test/r/func_concat.result
        M  mysql-test/r/func_str.result
        M  mysql-test/r/func_time.result
        M  mysql-test/r/gis.result
        M  mysql-test/r/information_schema.result
        M  mysql-test/r/innodb-autoinc.result
        M  mysql-test/r/join_outer.result
        M  mysql-test/r/myisam.result
        M  mysql-test/r/mysql.result
        M  mysql-test/r/mysql_upgrade.result
        M  mysql-test/r/mysqlbinlog.result
        M  mysql-test/r/openssl_1.result
        M  mysql-test/r/order_by.result
        M  mysql-test/r/partition.result
        M  mysql-test/r/partition_bug18198.result
        M  mysql-test/r/partition_error.result
        M  mysql-test/r/partition_innodb.result
        M  mysql-test/r/partition_pruning.result
        M  mysql-test/r/ps.result
        M  mysql-test/r/ps_ddl.result
        M  mysql-test/r/select.result
        M  mysql-test/r/sp-ucs2.result
        M  mysql-test/r/sp.result
        M  mysql-test/r/subselect.result
        M  mysql-test/r/union.result
        M  mysql-test/r/user_var.result
        M  mysql-test/r/variables.result
        M  mysql-test/std_data/Index.xml
        M  mysql-test/std_data/cacert.pem
        M  mysql-test/std_data/client-cert.pem
        M  mysql-test/std_data/client-key.pem
        M  mysql-test/std_data/server-cert.pem
        M  mysql-test/std_data/server-key.pem
        M  mysql-test/std_data/server8k-cert.pem
        M  mysql-test/std_data/server8k-key.pem
        M  mysql-test/suite/binlog/r/binlog_index.result
        M  mysql-test/suite/binlog/r/binlog_killed_simulate.result
        M  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
        M  mysql-test/suite/binlog/r/binlog_stm_blackhole.result
        M  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
        M  mysql-test/suite/binlog/r/binlog_unsafe.result
        M  mysql-test/suite/binlog/t/binlog_index.test
        M  mysql-test/suite/binlog/t/binlog_unsafe.test
        M  mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc
        M  mysql-test/suite/parts/inc/partition_timestamp.inc
        M  mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result
        M  mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result
        M  mysql-test/suite/parts/r/partition_datetime_innodb.result
        M  mysql-test/suite/parts/r/partition_datetime_myisam.result
        M  mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
        M  mysql-test/suite/rpl/r/rpl_do_grant.result
        M  mysql-test/suite/rpl/r/rpl_drop_temp.result
        M  mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
        M  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
        M  mysql-test/suite/rpl/r/rpl_killed_ddl.result
        M  mysql-test/suite/rpl/r/rpl_loaddata.result
        M  mysql-test/suite/rpl/r/rpl_loaddata_map.result
        M  mysql-test/suite/rpl/r/rpl_misc_functions.result
        M  mysql-test/suite/rpl/r/rpl_nondeterministic_functions.result
        M  mysql-test/suite/rpl/r/rpl_row_func003.result
        M  mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
        M  mysql-test/suite/rpl/r/rpl_stm_log.result
        M  mysql-test/suite/rpl/r/rpl_stm_until.result
        M  mysql-test/suite/rpl/r/rpl_temporary.result
        M  mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
        M  mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
        M  mysql-test/suite/rpl/t/rpl_do_grant.test
        M  mysql-test/suite/rpl/t/rpl_drop_temp.test
        M  mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
        M  mysql-test/suite/rpl/t/rpl_killed_ddl.test
        M  mysql-test/suite/rpl/t/rpl_misc_functions.test
        M  mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test
        M  mysql-test/suite/rpl/t/rpl_optimize.test
        M  mysql-test/suite/rpl/t/rpl_stm_until.test
        M  mysql-test/suite/rpl/t/rpl_temporary.test
        M  mysql-test/suite/rpl/t/rpl_timezone.test
        M  mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result
        M  mysql-test/t/alter_table.test
        M  mysql-test/t/bug46080.test
        M  mysql-test/t/count_distinct.test
        M  mysql-test/t/create.test
        M  mysql-test/t/ctype_ucs.test
        M  mysql-test/t/ctype_utf8.test
        M  mysql-test/t/delete.test
        M  mysql-test/t/disabled.def
        M  mysql-test/t/fulltext.test
        M  mysql-test/t/fulltext_order_by.test
        M  mysql-test/t/func_concat.test
        M  mysql-test/t/func_str.test
        M  mysql-test/t/gis.test
        M  mysql-test/t/information_schema.test
        M  mysql-test/t/innodb-autoinc.test
        M  mysql-test/t/innodb.test
        M  mysql-test/t/join_outer.test
        M  mysql-test/t/lock_multi.test
        M  mysql-test/t/myisam.test
        M  mysql-test/t/mysql.test
        M  mysql-test/t/mysql_upgrade.test
        M  mysql-test/t/mysqlbinlog.test
        M  mysql-test/t/openssl_1.test
        M  mysql-test/t/order_by.test
        M  mysql-test/t/partition.test
        M  mysql-test/t/partition_bug18198.test
        M  mysql-test/t/partition_error.test
        M  mysql-test/t/partition_innodb.test
        M  mysql-test/t/partition_pruning.test
        M  mysql-test/t/ps.test
        M  mysql-test/t/ps_ddl.test
        M  mysql-test/t/select.test
        M  mysql-test/t/sp-ucs2.test
        M  mysql-test/t/sp.test
        M  mysql-test/t/subselect.test
        M  mysql-test/t/union.test
        M  mysql-test/t/user_var.test
        M  mysql-test/t/variables.test
        M  mysys/charset.c
        M  mysys/default.c
        M  mysys/mf_pack.c
        M  mysys/my_getopt.c
        M  mysys/my_init.c
        M  mysys/my_thr_init.c
        M  mysys/my_winthread.c
        M  mysys/stacktrace.c
        M  netware/libmysqlmain.c
        M  scripts/mysql_system_tables_fix.sql
        M  scripts/mysqld_multi.sh
        M  server-tools/instance-manager/instance_map.cc
        M  server-tools/instance-manager/listener.cc
        M  server-tools/instance-manager/options.cc
        M  server-tools/instance-manager/user_map.cc
        M  sql/event_data_objects.cc
        M  sql/event_db_repository.cc
        M  sql/event_scheduler.cc*
        M  sql/events.cc
        M  sql/field.cc
        M  sql/field.h
        M  sql/filesort.cc
        M  sql/ha_partition.cc
        M  sql/ha_partition.h
        M  sql/item.cc
        M  sql/item.h
        M  sql/item_cmpfunc.cc
        M  sql/item_cmpfunc.h
        M  sql/item_create.cc
        M  sql/item_func.cc
        M  sql/item_func.h
        M  sql/item_strfunc.cc
        M  sql/item_strfunc.h
        M  sql/item_timefunc.cc
        M  sql/item_timefunc.h
        M  sql/log.cc
        M  sql/log.h
        M  sql/log_event.cc
        M  sql/log_event.h
        M  sql/log_event_old.cc
        M  sql/mysql_priv.h
        M  sql/mysqld.cc
        M  sql/rpl_injector.cc
        M  sql/rpl_record.cc
        M  sql/rpl_rli.cc
        M  sql/rpl_rli.h
        M  sql/set_var.cc
        M  sql/share/errmsg.txt
        M  sql/slave.cc
        M  sql/sp.cc
        M  sql/sp_head.cc
        M  sql/sp_pcontext.h
        M  sql/sql_acl.cc
        M  sql/sql_base.cc
        M  sql/sql_class.h
        M  sql/sql_connect.cc
        M  sql/sql_crypt.cc
        M  sql/sql_crypt.h
        M  sql/sql_db.cc
        M  sql/sql_delete.cc
        M  sql/sql_insert.cc
        M  sql/sql_load.cc
        M  sql/sql_parse.cc
        M  sql/sql_partition.cc
        M  sql/sql_partition.h
        M  sql/sql_plugin.cc
        M  sql/sql_prepare.cc
        M  sql/sql_rename.cc
        M  sql/sql_repl.cc
        M  sql/sql_select.cc
        M  sql/sql_select.h
        M  sql/sql_servers.cc
        M  sql/sql_show.cc
        M  sql/sql_table.cc
        M  sql/sql_tablespace.cc
        M  sql/sql_test.cc
        M  sql/sql_trigger.cc
        M  sql/sql_udf.cc
        M  sql/sql_union.cc
        M  sql/sql_update.cc
        M  sql/sql_view.cc
        M  sql/sql_yacc.yy
        M  sql/table.cc
        M  storage/archive/ha_archive.cc
        M  storage/ibmdb2i/db2i_constraints.cc
        M  storage/ibmdb2i/ha_ibmdb2i.cc
        M  storage/innobase/fil/fil0fil.c
        M  storage/innobase/handler/ha_innodb.cc
        M  storage/innobase/handler/ha_innodb.h
        M  storage/innobase/include/fil0fil.h
        M  storage/innobase/include/lock0lock.h
        M  storage/innobase/include/mtr0mtr.h
        M  storage/innobase/include/srv0srv.h
        M  storage/innobase/lock/lock0lock.c
        M  storage/innobase/log/log0log.c
        M  storage/innobase/log/log0recv.c
        M  storage/innobase/row/row0mysql.c
        M  storage/innobase/srv/srv0srv.c
        M  storage/innobase/srv/srv0start.c
        M  storage/innodb_plugin/CMakeLists.txt
        M  storage/innodb_plugin/handler/ha_innodb.cc
        M  storage/myisam/mi_packrec.c
        M  storage/myisam/mi_static.c
        M  storage/myisam/myisamdef.h
        M  storage/myisammrg/ha_myisammrg.cc
        M  storage/ndb/include/ndbapi/NdbEventOperation.hpp
        M  storage/ndb/include/ndbapi/NdbOperation.hpp
        M  storage/ndb/src/ndbapi/NdbEventOperation.cpp
        M  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
        M  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
        M  strings/Makefile.am
        M  strings/ctype-ucs2.c
        M  strings/strmov.c
        M  support-files/Makefile.am
        M  support-files/mysql.spec.sh
        M  win/configure.js
        M  mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result
        M  mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
=== modified file 'mysql-test/suite/binlog/r/binlog_unsafe.result'
--- a/mysql-test/suite/binlog/r/binlog_unsafe.result	2010-02-10 21:11:06 +0000
+++ b/mysql-test/suite/binlog/r/binlog_unsafe.result	2010-03-23 09:14:15 +0000
@@ -3243,7 +3243,7 @@ Warnings:
 Note	1592	Statement may not be safe to log in statement format.
 INSERT INTO t1 VALUES (RAND());
 Warnings:
-Note	1592	Statement may not be safe to log in statement format.
+Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Statement uses a system function whose value may differ on slave.
 DELETE FROM t1;
 SET TIMESTAMP=1000000;
 INSERT INTO t1 VALUES

=== modified file 'mysql-test/suite/rpl/r/rpl_bug41902.result'
--- a/mysql-test/suite/rpl/r/rpl_bug41902.result	2009-12-19 08:19:17 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug41902.result	2010-03-23 09:14:15 +0000
@@ -4,7 +4,6 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index.');
 stop slave;
 SET @@debug="d,simulate_find_log_pos_error";
 reset slave;
@@ -32,8 +31,4 @@ purge binary logs to 'master-bin.000001'
 ERROR HY000: Target log not found in binlog index
 SET @@debug="";
 purge binary logs to 'master-bin.000001';
-call mtr.add_suppression("Failed to locate old binlog or relay log files");
-call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
-call mtr.add_suppression("Failed to locate old binlog or relay log files");
-call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
 End of the tests

=== modified file 'mysql-test/suite/rpl/r/rpl_user.result'
--- a/mysql-test/suite/rpl/r/rpl_user.result	2010-02-02 14:04:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_user.result	2010-03-23 09:14:15 +0000
@@ -15,10 +15,17 @@ create user 'foo'@'fakehost', 'bar'@'fak
 ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost'
 create user 'foo'@'fakehost', 'bar'@'fakehost';
 ERROR HY000: Operation CREATE USER failed for 'foo'@'fakehost','bar'@'fakehost'
+create user 'foo1'@'fakehost' IDENTIFIED BY 'foo1', 'foo2'@'fakehost'
+  IDENTIFIED BY PASSWORD'*1111111111111111111111111111111111111111',
+'foo3'@'fakehost';
 select Host,User from mysql.user where Host='fakehost';
 Host	User
 fakehost	bar
 fakehost	foo
+fakehost	foo1
+fakehost	foo2
+fakehost	foo3
+Comparing tables master:mysql.user and slave:mysql.user
 rename user 'foo'@'fakehost' to 'foofoo'@'fakehost';
 rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost';
 ERROR HY000: Operation RENAME USER failed for 'not_exist_user1'@'fakehost'
@@ -27,8 +34,12 @@ ERROR HY000: Operation RENAME USER faile
 select Host,User from mysql.user where Host='fakehost';
 Host	User
 fakehost	barbar
+fakehost	foo1
+fakehost	foo2
+fakehost	foo3
 fakehost	foofoo
 drop user 'foofoo'@'fakehost';
+drop user 'foo1'@'fakehost', 'foo2'@'fakehost', 'foo3'@'fakehost';
 drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost';
 ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost'
 drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost';
@@ -37,9 +48,11 @@ select Host,User from mysql.user where H
 Host	User
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; create user 'foo'@'fakehost'
-master-bin.000001	#	Query	#	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'foo'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'foo'@'fakehost', 'bar'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'foo1'@'fakehost' IDENTIFIED BY PASSWORD '*6EAC5249D53050AE649BDB0CC4B85D1AE90CA16E', 'foo2'@'fakehost' IDENTIFIED BY PASSWORD '*1111111111111111111111111111111111111111', 'foo3'@'fakehost'
 master-bin.000001	#	Query	#	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'
 master-bin.000001	#	Query	#	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'
 master-bin.000001	#	Query	#	#	use `test`; drop user 'foofoo'@'fakehost'
+master-bin.000001	#	Query	#	#	use `test`; drop user 'foo1'@'fakehost', 'foo2'@'fakehost', 'foo3'@'fakehost'
 master-bin.000001	#	Query	#	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'

=== modified file 'mysql-test/suite/rpl/t/rpl_bug41902.test'
--- a/mysql-test/suite/rpl/t/rpl_bug41902.test	2009-12-19 08:16:52 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug41902.test	2010-03-23 09:14:15 +0000
@@ -4,8 +4,12 @@
 
 source include/have_debug.inc;
 source include/master-slave.inc;
-call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index.');
 
+-- disable_query_log
+CALL mtr.add_suppression("Failed to locate old binlog or relay log files");
+CALL mtr.add_suppression('MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index.');
+-- enable_query_log
+sync_slave_with_master;
 
 #
 # test checks that 
@@ -51,10 +55,4 @@ purge binary logs to 'master-bin.000001'
 SET @@debug="";
 purge binary logs to 'master-bin.000001';
 
-call mtr.add_suppression("Failed to locate old binlog or relay log files");
-call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
-connection slave;
-call mtr.add_suppression("Failed to locate old binlog or relay log files");
-call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
-
 --echo End of the tests

=== modified file 'mysql-test/suite/rpl/t/rpl_slow_query_log.test'
--- a/mysql-test/suite/rpl/t/rpl_slow_query_log.test	2010-02-24 13:52:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slow_query_log.test	2010-03-20 09:35:40 +0000
@@ -20,10 +20,10 @@
 #         prevents logging slow queries in a connection 'extra'
 #
 # OBS: 
-#   This test only runs for statement binlogging format because on row format
-#   slow queries do not get slow query logged. 
-#   Note that due to the sleep() command the insert is written to the binary
-#   log in row format.
+#   This test only runs for statement binlogging format because on row
+#   format slow queries do not get slow query logged. Due to the
+#   sleep() command, the insert would be binlogged in row format if
+#   binlog_format=MIXED. Hence, we do not use binlog_format=MIXED.
 
 source include/master-slave.inc;
 source include/have_binlog_format_statement.inc;

=== removed file 'mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt	2010-01-20 19:08:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_binlog_direct-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-direct-non-transactional-updates

=== modified file 'mysql-test/suite/rpl/t/rpl_user.test'
--- a/mysql-test/suite/rpl/t/rpl_user.test	2010-02-02 13:38:44 +0000
+++ b/mysql-test/suite/rpl/t/rpl_user.test	2010-02-24 02:49:10 +0000
@@ -25,8 +25,15 @@ create user 'foo'@'fakehost', 'bar'@'fak
 --error ER_CANNOT_USER
 create user 'foo'@'fakehost', 'bar'@'fakehost';
 
+# In log event, Plaintext password 'foo1' is replaced by ciphertext.
+create user 'foo1'@'fakehost' IDENTIFIED BY 'foo1', 'foo2'@'fakehost'
+  IDENTIFIED BY PASSWORD'*1111111111111111111111111111111111111111',
+  'foo3'@'fakehost';
 sync_slave_with_master;
 select Host,User from mysql.user where Host='fakehost';
+let $diff_table_1= master:mysql.user;
+let $diff_table_2= slave:mysql.user;
+source include/diff_tables.inc;
 
 #
 # Test rename user
@@ -46,6 +53,7 @@ select Host,User from mysql.user where H
 #
 connection master;
 drop user 'foofoo'@'fakehost';
+drop user 'foo1'@'fakehost', 'foo2'@'fakehost', 'foo3'@'fakehost';
 --error ER_CANNOT_USER
 drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost';
 --error ER_CANNOT_USER

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt	2009-07-22 20:14:20 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors-master.opt	2010-03-03 13:33:43 +0000
@@ -1 +1 @@
---innodb $EXAMPLE_PLUGIN_OPT --binlog-ignore-db=other
+--innodb $EXAMPLE_PLUGIN_OPT --binlog-ignore-db=other --log-output=file,table

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-03-02 14:39:15 +0000
+++ b/sql/sql_acl.cc	2010-03-23 09:14:15 +0000
@@ -5793,16 +5793,31 @@ static int handle_grant_data(TABLE_LIST 
   DBUG_RETURN(result);
 }
 
-
-static void append_user(String *str, LEX_USER *user)
+/**
+  Auxiliary function for constructing a  user list string.
+  @param str     A String to store the user list.
+  @param user    A LEX_USER which will be appended into user list.
+  @param comma   If TRUE, append a ',' before the the user.
+  @param passwd  If TRUE, append ' IDENTIFIED BY PASSWORD ...' after the user,
+                 if the given user has password.
+ */
+static void append_user(String *str, LEX_USER *user, bool comma= TRUE,
+                        bool passwd= FALSE)
 {
-  if (str->length())
+  if (comma)
     str->append(',');
   str->append('\'');
   str->append(user->user.str);
   str->append(STRING_WITH_LEN("'@'"));
   str->append(user->host.str);
   str->append('\'');
+
+  if (passwd && user->password.str)
+  {
+    str->append(STRING_WITH_LEN(" IDENTIFIED BY PASSWORD '"));
+    str->append(user->password.str, user->password.length);
+    str->append('\'');
+  }
 }
 
 
@@ -5823,6 +5838,8 @@ bool mysql_create_user(THD *thd, List <L
 {
   int result;
   String wrong_users;
+  String log_query;
+  ulong sql_mode;
   LEX_USER *user_name, *tmp_user_name;
   List_iterator <LEX_USER> user_list(list);
   TABLE_LIST tables[GRANT_TABLES];
@@ -5851,6 +5868,7 @@ bool mysql_create_user(THD *thd, List <L
   mysql_rwlock_wrlock(&LOCK_grant);
   mysql_mutex_lock(&acl_cache->lock);
 
+  log_query.append(STRING_WITH_LEN("CREATE USER"));
   while ((tmp_user_name= user_list++))
   {
     if (!(user_name= get_current_user(thd, tmp_user_name)))
@@ -5859,13 +5877,17 @@ bool mysql_create_user(THD *thd, List <L
       continue;
     }
 
+    log_query.append(' ');
+    append_user(&log_query, user_name, FALSE, TRUE);
+    log_query.append(',');
+
     /*
       Search all in-memory structures and grant tables
       for a mention of the new user name.
     */
     if (handle_grant_data(tables, 0, user_name, NULL))
     {
-      append_user(&wrong_users, user_name);
+      append_user(&wrong_users, user_name, wrong_users.length() > 0);
       result= TRUE;
       continue;
     }
@@ -5873,7 +5895,7 @@ bool mysql_create_user(THD *thd, List <L
     some_users_created= TRUE;
     if (replace_user_table(thd, tables[0].table, *user_name, 0, 0, 1, 0))
     {
-      append_user(&wrong_users, user_name);
+      append_user(&wrong_users, user_name, wrong_users.length() > 0);
       result= TRUE;
     }
   }
@@ -5884,7 +5906,11 @@ bool mysql_create_user(THD *thd, List <L
     my_error(ER_CANNOT_USER, MYF(0), "CREATE USER", wrong_users.c_ptr_safe());
 
   if (some_users_created)
-    result |= write_bin_log(thd, FALSE, thd->query(), thd->query_length());
+  {
+    /* Remove the last ',' */
+    log_query.length(log_query.length()-1);
+    result|= write_bin_log(thd, FALSE, log_query.c_ptr_safe(), log_query.length());
+  }
 
   mysql_rwlock_unlock(&LOCK_grant);
   close_thread_tables(thd);
@@ -5953,7 +5979,7 @@ bool mysql_drop_user(THD *thd, List <LEX
     }  
     if (handle_grant_data(tables, 1, user_name, NULL) <= 0)
     {
-      append_user(&wrong_users, user_name);
+      append_user(&wrong_users, user_name, wrong_users.length() > 0);
       result= TRUE;
       continue;
     }
@@ -6050,7 +6076,7 @@ bool mysql_rename_user(THD *thd, List <L
     if (handle_grant_data(tables, 0, user_to, NULL) ||
         handle_grant_data(tables, 0, user_from, user_to) <= 0)
     {
-      append_user(&wrong_users, user_from);
+      append_user(&wrong_users, user_from, wrong_users.length() > 0);
       result= TRUE;
       continue;
     }


Attachment: [text/bzr-bundle] bzr/zhenxing.he@sun.com-20100323091415-jybhlt9j5hh05nu6.bundle
Thread
bzr commit into mysql-6.0-codebase-bugfixing branch (zhenxing.he:3847) He Zhenxing23 Mar