1. 11 Jan, 2008 3 commits
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl · 27e1a36d
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Auto merged
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      mysql-test/include/have_multi_ndb.inc:
        Manual merge.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
        Manual merge.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
        Manual merge.
      27e1a36d
    • unknown's avatar
      Post-merge fixes to make tests pass. · 1754c58d
      unknown authored
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Fixing test file to use different positions depending
        on binlog format.
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        Result change.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Result change.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Result change.
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Removing part of test that does not work any more.
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Removing part of test that does not work any more.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
        Result change.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
        Dropping tables on both master and slave, and not only on slave.
      1754c58d
    • unknown's avatar
      Post-merge fixes to make binlog test suite pass. · c06d3d70
      unknown authored
      
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Fixing test to use different positions depending on binlog format.
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
        Result change.
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Result change.
      mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
        Removing part of test that does not work any more.
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        Removing part of test that does not work any more.
      c06d3d70
  2. 09 Jan, 2008 1 commit
    • unknown's avatar
      Post-merge fixes to make tests pass. · ac167eca
      unknown authored
      
      mysql-test/r/binlog_start_comment.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Result change.
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Result change.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
        Result change.
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
        Masking out columns with binlog positions from slave status.
      mysql-test/t/binlog_start_comment.test:
        Added missing drop table causing subsequent tests to fail.
      sql/log_event.cc:
        Changing last_err* fields to client_last_err*
      sql/log_event_old.cc:
        Changing last_err* fields to client_last_err*
      ac167eca
  3. 02 Jan, 2008 1 commit
  4. 31 Dec, 2007 1 commit
  5. 25 Dec, 2007 1 commit
    • unknown's avatar
      WL#4077, added mask for SHOW DATABASES statement · d658b408
      unknown authored
      
      mysql-test/suite/rpl/r/rpl_create_database.result:
        updated result file
      mysql-test/suite/rpl/r/rpl_load_from_master.result:
        updated result file
      mysql-test/suite/rpl/t/rpl_create_database.test:
        added the mask 'mysql%' for SHOW DATABASES
      mysql-test/suite/rpl/t/rpl_load_from_master.test:
        added the mask 'mysql%' for SHOw DATABASES
      d658b408
  6. 24 Dec, 2007 3 commits
    • unknown's avatar
      Remove test rpl_drop_view from main suite · 0e862b75
      unknown authored
      
      BitKeeper/deleted/.del-rpl_drop_view.test:
        Delete: mysql-test/t/rpl_drop_view.test
      BitKeeper/deleted/.del-rpl_drop_view.result:
        Delete: mysql-test/r/rpl_drop_view.result
      0e862b75
    • unknown's avatar
      Move test rpl_server_id to suite rpl · bbbdec34
      unknown authored
      
      mysql-test/suite/rpl/t/rpl_server_id.test:
        Rename: mysql-test/t/rpl_server_id.test -> mysql-test/suite/rpl/t/rpl_server_id.test
      mysql-test/suite/rpl/r/rpl_server_id.result:
        Rename: mysql-test/r/rpl_server_id.result -> mysql-test/suite/rpl/r/rpl_server_id.result
      bbbdec34
    • unknown's avatar
      Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0 · 529a480d
      unknown authored
      into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.1
      
      
      sql/set_var.cc:
        Auto merged
      BitKeeper/deleted/.del-rpl_slave_skip.result:
        Auto merged
      BitKeeper/deleted/.del-rpl_slave_skip.test:
        Auto merged
      sql/slave.cc:
        Manual merged
      529a480d
  7. 21 Dec, 2007 7 commits
    • unknown's avatar
      Undo previous merge. · 7bc3e859
      unknown authored
      
      BitKeeper/deleted/.del-rpl_transaction.result:
        Delete: mysql-test/r/rpl_transaction.result
      BitKeeper/deleted/.del-rpl_transaction-master.opt:
        Delete: mysql-test/t/rpl_transaction-master.opt
      BitKeeper/deleted/.del-rpl_transaction-slave.opt:
        Delete: mysql-test/t/rpl_transaction-slave.opt
      BitKeeper/deleted/.del-rpl_transaction.test:
        Delete: mysql-test/t/rpl_transaction.test
      7bc3e859
    • unknown's avatar
      Merge riska.(none):/home/sven/bk/b26395-autocommit-xa/5.0-rpl · ee9213de
      unknown authored
      into  riska.(none):/home/sven/bk/b26395-autocommit-xa/5.1-new-rpl
      Should really not be merged, will undo later
      
      
      sql/log_event.cc:
        Auto merged
      BitKeeper/deleted/.del-sp_trans_log.result:
        Auto merged
      mysql-test/r/multi_update.result:
        bad auto merge, will undo later
      mysql-test/r/variables-big.result:
        bad auto merge, will undo later
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        bad auto merge, will undo later
      sql/log.cc:
        bad auto merge, will undo later
      ee9213de
    • unknown's avatar
      BUG#26395: if crash during autocommit update to transactional table on master, slave fails · b5d95f02
      unknown authored
      Now, every transaction (including autocommit transactions) start with
      a BEGIN and end with a COMMIT/ROLLBACK in the binlog.
      Added a test case, and updated lots of test case result files.
      
      
      mysql-test/t/rpl_transaction-master.opt:
        BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-master.opt
      mysql-test/t/rpl_transaction-slave.opt:
        BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-slave.opt
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Updated result file
      mysql-test/r/multi_update.result:
        Updated result file
      mysql-test/r/rpl_transaction.result:
        New result file for new test case.
      mysql-test/r/sp_trans_log.result:
        Updated result file
      mysql-test/r/variables-big.result:
        Updated result file
      mysql-test/t/rpl_transaction.test:
        New test case.
      sql/log.cc:
         - Always write BEGIN and COMMIT around statements, even in autocommit
           mode.
         - Added comments for binlog_commit and binlog_rollback.
      sql/log_event.cc:
        Added debug trigger to avoid writing xid events to the binlog.
      b5d95f02
    • unknown's avatar
      fixed broken result file · a82cb421
      unknown authored
      a82cb421
    • unknown's avatar
      Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl · 76159fdf
      unknown authored
      into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0
      
      
      76159fdf
    • unknown's avatar
      Merge capulet.kindahl.net:/home/mats/devel/b12691-mysql-5.0-rpl · 9d7c0dda
      unknown authored
      into  capulet.kindahl.net:/home/mats/devel/fix-mysql-5.0-rpl
      
      
      9d7c0dda
    • unknown's avatar
      BUG#28908 Replication: set global server_id is not setting the session server_id · e2937d7f
      unknown authored
      When set the server-id dynamically, the server_id member of current thread is not updated.
      
      Update the server_id member of current thread after updated the global variable value.
      
      
      sql/set_var.cc:
        Update server_id of current thread
      mysql-test/r/rpl_server_id.result:
        Add test for BUG#28908
      mysql-test/t/rpl_server_id.test:
        Add test for BUG#28908
      e2937d7f
  8. 20 Dec, 2007 4 commits
    • unknown's avatar
      Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 45ac6b3d
      unknown authored
      into  riska.(none):/home/sven/bkroot/5.1-new-rpl
      
      
      45ac6b3d
    • unknown's avatar
      Fixed errors in pushbuild by updating test and result files. · c9cbd6a4
      unknown authored
      
      mysql-test/suite/binlog/r/binlog_row_binlog.result:
        updated result file.
        This part of the test was created in parallel with the fix to bug#26395,
        which modifies the output of mysqlbinlog and hence the output of many
        tests, including this one.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
        updated result file
      mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
        1. replaced include/show_slave_status.inc by more specific tests for the
        SQL error and IO error, as well as Slave_IO_State.
        2. drop all tables at the end of test.
      c9cbd6a4
    • unknown's avatar
      WL#4077 fix for innodb test that were skipped · 8e2d28e0
      unknown authored
      
      mysql-test/include/have_innodb.inc:
        added new value 'ENABLED' for 'support' field
      8e2d28e0
    • unknown's avatar
      BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER): · 150590a0
      unknown authored
      Complementary patch since LOAD DATA INFILE was not covered in
      the previous patch.
      
      This patch adds a check so that the slave skip counter is not
      decreased to zero if seeing a BEGIN_LOAD_QUERY_EVENT,
      APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT since these cannot
      end a group. The group is terminated by an EXECUTE_LOAD_QUERY_
      EVENT or DELETE_FILE_EVENT.
      
      
      mysql-test/r/rpl_slave_skip.result:
        Result change.
      mysql-test/t/rpl_slave_skip.test:
        Adding tests to test that the first event of a LOAD DATA INFILE
        can be skipped safely for both transactional and non-transactional
        tables. Also include a case that will generate a DELETE_FILE event
        last in the group, and this should be properly skipped as well.
      sql/slave.cc:
        Not decrementing slave skip counter to zero when seeing a
        BEGIN_LOAD_QUERY_EVENT, APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT
        since these cannot end a group.
      150590a0
  9. 19 Dec, 2007 5 commits
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge · a2409d60
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      sql/sql_string.cc:
        Auto merged
      a2409d60
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl · 047ec78f
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
      
      
      mysql-test/include/have_multi_ndb.inc:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
        Auto merged
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
        Auto merged
      mysql-test/suite/rpl_ndb/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/rpl_rli.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_binlog.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      mysql-test/Makefile.am:
        SCCS merged
      mysql-test/mysql-test-run.pl:
        Manual merge.
      mysql-test/suite/binlog/t/disabled.def:
        Manual merge.
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
        Manual merge.
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Manual merge.
      sql/log_event.cc:
        Manual merge.
        ,
      047ec78f
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · f2166156
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
      
      
      sql/sql_string.cc:
        Auto merged
      f2166156
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 267b00d6
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      mysql-test/r/user_var-binlog.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_stm_charset.result:
        Auto merged
      sql/log_event.cc:
        Auto merged
      267b00d6
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · e64fae8b
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
      
      
      BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        Auto merged
      mysql-test/r/user_var-binlog.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_stm_charset.result:
        Auto merged
      mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
        Manual merge, using remove version of test.
      mysql-test/suite/rpl/r/rpl_timezone.result:
        Manual merge.
      sql/log_event.cc:
        Manual merge
      e64fae8b
  10. 18 Dec, 2007 1 commit
  11. 17 Dec, 2007 2 commits
    • unknown's avatar
      Merge hezx.(none):/media/sda3/work/mysql/bkwork/bug#32205/5.1 · 7477060b
      unknown authored
      into  hezx.(none):/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.1-new-rpl
      
      
      mysql-test/r/mysqlbinlog2.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Auto merged
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
        Auto merged
      sql/log_event.cc:
        Auto merged
      7477060b
    • unknown's avatar
      BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates · 0968c713
      unknown authored
      fine
      
      The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
      output with a delimeter appended right after it, if the query string ends with a '--'
      comment, then the delimeter would be considered as part of the comment, if there are any
      statements after this query, then it will cause a syntax error.
      
      Start a newline before appending delimiter after a query string
      
      
      mysql-test/r/mysqlbinlog.result:
        Update result for BUG#32205
      mysql-test/r/mysqlbinlog2.result:
        Update result for BUG#32205
      mysql-test/r/user_var-binlog.result:
        Update result for BUG#32205
      mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
        Update result for BUG#32205
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
        Update result for BUG#32205
      mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
        fix test for BUG#32205
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
        Update result for BUG#32205
      mysql-test/suite/rpl/r/rpl_stm_charset.result:
        Update result for BUG#32205
      sql/log_event.cc:
        Start a newline before appending delimiter after a query string
      mysql-test/suite/binlog/r/binlog_start_comment.result:
        Add test for BUG#32205
      mysql-test/suite/binlog/t/binlog_start_comment.test:
        Add test for BUG#32205
      0968c713
  12. 15 Dec, 2007 6 commits
    • unknown's avatar
      Try to fix assertion failures at slave shutdown when running · 7213ca20
      unknown authored
      rpl_ndb tests on sapsrv1.
      
      
      sql/ha_ndbcluster_binlog.cc:
        Try to fix assertion failures at slave shutdown when running
        rpl_ndb tests. If the binlog thread is killed, which happens during
        shutdown, open_tables returns error without setting an error
        in THD. Therefore one can't access thd->main_da.message() if thd->killed.
      7213ca20
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · b8671579
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      b8671579
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 81dda2e7
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      81dda2e7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · cb48c979
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      cb48c979
    • unknown's avatar
      BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine · 59035063
      unknown authored
      The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
      output with a delimeter appended right after it, if the query string ends with a '--'
      comment, then the delimeter would be considered as part of the comment, if there are any
      statements after this query, then it will cause a syntax error.
      
      Start a newline before appending delimiter after a query string
      
      
      mysql-test/r/ctype_ucs_binlog.result:
        Update test result for BUG#32205
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Update test result for BUG#32205
      mysql-test/r/mysqlbinlog.result:
        Update test result for BUG#32205
      mysql-test/r/rpl_charset.result:
        Update test result for BUG#32205
      mysql-test/r/rpl_timezone.result:
        Update test result for BUG#32205
      mysql-test/r/user_var-binlog.result:
        Update test result for BUG#32205
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Fixed for BUG#32205
      sql/log_event.cc:
        Start a newline before appending delimiter after a query string
      mysql-test/r/binlog_start_comment.result:
        Add test for BUG#32205
      mysql-test/t/binlog_start_comment.test:
        Add test for BUG#32205
      59035063
    • unknown's avatar
      WL#4165 (Prepared statements: validation) · 0a578711
      unknown authored
      Adding the tests cases alone for WL#4165, disabled
      
      
      mysql-test/t/disabled.def:
        WL#4165 (Prepared statements: validation)
      mysql-test/r/ps_ddl.result:
        WL#4165 (Prepared statements: validation)
      mysql-test/t/ps_ddl.test:
        WL#4165 (Prepared statements: validation)
      0a578711
  13. 14 Dec, 2007 5 commits
    • unknown's avatar
      Merge riska.(none):/home/sven/bkroot/5.1-new-rpl · 13946e0f
      unknown authored
      into  riska.(none):/home/sven/bk/b32407-5.1-new-rpl-mysqlbinlog_base64
      
      
      13946e0f
    • unknown's avatar
      BUG#32407: Impossible to do point-in-time recovery from older binlog · 8d37a30e
      unknown authored
      Problem: it is unsafe to read base64-printed events without first
      reading the Format_description_log_event (FD).  Currently, mysqlbinlog
      cannot print the FD.
      
      As a side effect, another bug has also been fixed: When mysqlbinlog
      --start-position=X was specified, no ROLLBACK was printed. I changed
      this, so that ROLLBACK is always printed.
      
      This patch does several things:
      
       - Format_description_log_event (FD) now print themselves in base64
         format.
      
       - mysqlbinlog is now able to print FD events.  It has three modes:
          --base64-output=auto    Print row events in base64 output, and print
                                  FD event.  The FD event is printed even if
                                  it is outside the range specified with
                                  --start-position, because it would not be
                                  safe to read row events otherwise. This is
                                  the default.
      
          --base64-output=always  Like --base64-output=auto, but also print
                                  base64 output for query events.  This is
                                  like the old --base64-output flag, which
                                  is also a shorthand for
                                  --base64-output=always
      
          --base64-output=never   Never print base64 output, generate error if
                                  row events occur in binlog.  This is
                                  useful to suppress the FD event in binlogs
                                  known not to contain row events (e.g.,
                                  because BINLOG statement is unsafe,
                                  requires root privileges, is not SQL, etc)
      
       - the BINLOG statement now handles FD events correctly, by setting
         the thread's rli's relay log's description_event_for_exec to the
         loaded event.
      
         In fact, executing a BINLOG statement is almost the same as reading
         an event from a relay log.  Before my patch, the code for this was
         separated (exec_relay_log_event in slave.cc executes events from
         the relay log, mysql_client_binlog_statement in sql_binlog.cc
         executes BINLOG statements).  I needed to augment
         mysql_client_binlog_statement to do parts of what
         exec_relay_log_event does.  Hence, I did a small refactoring and
         moved parts of exec_relay_log_event to a new function, which I
         named apply_event_and_update_pos.  apply_event_and_update_pos is
         called both from exec_relay_log_event and from
         mysql_client_binlog_statement.
      
       - When a non-FD event is executed in a BINLOG statement, without
         previously executing a FD event in a BINLOG statement, it generates
         an error, because that's unsafe.  I took a new error code for that:
         ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENTS.
      
         In order to get a decent error message containing the name of the
         event, I added the class method char*
         Log_event::get_type_str(Log_event_type type), which returns a
         string name for the given Log_event_type.  This is just like the
         existing char* Log_event::get_type_str(), except it is a class
         method that takes the log event type as parameter.
      
         I also added PRE_GA_*_ROWS_LOG_EVENT to Log_event::get_type_str(),
         so that names of old rows event are properly printed.
      
       - When reading an event, I added a check that the event type is known
         by the current Format_description_log_event. Without this, it may
         crash on bad input (and I was struck by this several times).
      
       - I patched the following test cases, which all contain BINLOG
         statements for row events which must be preceded by BINLOG
         statements for FD events:
          - rpl_bug31076
      
      While I was here, I fixed some small things in log_event.cc:
      
       - replaced hard-coded 4 by EVENT_TYPE_OFFSET in 3 places
      
       - replaced return by DBUG_VOID_RETURN in one place
      
       - The name of the logfile can be '-' to indicate stdin.  Before my
         patch, the code just checked if the first character is '-'; now it
         does a full strcmp().  Probably, all arguments that begin with a -
         are already handled somewhere else as flags, but I still think it
         is better that the code reflects what it is supposed to do, with as
         little dependencies as possible on other parts of the code.  If we
         one day implement that all command line arguments after -- are
         files (as most unix tools do), then we need this.
      
      I also fixed the following in slave.cc:
      
       - next_event() was declared twice, and queue_event was not static but
         should be static (not used outside the file).
      
      
      client/client_priv.h:
        Declared the new option for base64 output.
      client/mysqlbinlog.cc:
         - Change from using the two-state command line option
          "default/--base64-output" to the three-state
          "--base64-output=[never|auto|always]"
         - Print the FD event even if it is outside the --start-position range.
         - Stop if a row event is about to be printed without a preceding FD
           event.
         - Minor fixes:
            * changed 4 to EVENT_TYPE_OFFSET in some places
            * Added comments
            * before, "mysqlbinlog -xyz" read from stdin; now it does not
              (only "mysqlbinlog -" reads stdin).
      mysql-test/r/mysqlbinlog2.result:
        Updated result file: mysqlbinlog now prints ROLLBACK always.
      mysql-test/suite/binlog/t/disabled.def:
        The test must be disabled since it reveals another bug: see BUG#33247.
      mysql-test/suite/rpl/r/rpl_bug31076.result:
        Updated result file
      mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
        Updated result file
      mysql-test/suite/rpl/t/rpl_bug31076.test:
        Had to add explicit Format_description_log_event before other BINLOG
        statements
      mysql-test/t/mysqlbinlog2.test:
        we must suppress base64 output in result file because it contains a
        timestamp
      sql/log_event.cc:
         - Made FD events able to print themselves
         - Added check that the current FD event knows about the event type, when
           an event is about to be read. (Hint to reviewers: I had to re-indent
           a big block because of this; use diff -b)
            * To get a decent error message, I also added a class method
              const char* Log_event::get_type_str(Log_event_type)
              which converts number to event type string without having a
              Log_event object.
            * Made Log_event::get_type_str aware of PRE_GA_*_ROWS_LOG_EVENT.
         - Minor fixes:
            * Changed return to DBUG_VOID_RETURN
      sql/log_event.h:
         - Declared enum to describe the three base64_output modes
         - Use the enum instead of a flag
         - Declare the new class method get_type_str (see log_event.cc)
      sql/share/errmsg.txt:
        Added error msg.
      sql/slave.cc:
         - Factored out part of exec_relay_log_event to the new function
           apply_event_and_update_pos, because that code is needed when executing
           BINLOG statements. (this is be functionally equivalent to the
           previous code, except: (1) skipping events is now optional, controlled
           by a parameter to the new function (2) the return value of
           exec_relay_log_event has changed; see next item).
         - Changed returned error value to always be 1. Before, it would return
           the error value from apply_log_event, which was unnecessary. This
           change is safe because the exact return value of exec_relay_log_event
           is never examined; it is only tested to be ==0 or !=0.
         - Added comments describing exec_relay_log_event and
           apply_event_and_update_pos.
         - Minor fixes:
            * Removed duplicate declaration of next_event, made queue_event
              static.
            * Added doxygen code to include this file.
      sql/slave.h:
        Declared the new apply_event_and_update_pos
      sql/sql_binlog.cc:
         - Made mysql_binlog_statement set the current FD event when the given
           event is an FD event. This entails using the new function
           apply_event_and_update_pos from slave.cc instead of just calling the
           ev->apply method.
         - Made mysql_binlog_statement fail if the first BINLOG statement is not
           an FD event.
      mysql-test/suite/binlog/r/binlog_base64_flag.result:
        New test file needs new result file
      mysql-test/suite/binlog/t/binlog_base64_flag.test:
        Added test case to verify that:
         - my patch fixes the bug
         - the new --base64-output flag works as expected
         - base64 events not preceded by an FD event give an error
         - an event of a type not known by the current FD event fails cleanly.
      mysql-test/suite/binlog/std_data/binlog-bug32407.000001:
        BitKeeper file /home/sven/bk/b32407-5.1-new-rpl-mysqlbinlog_base64/mysql-test/suite/binlog/std_data/binlog-bug32407.000001
      8d37a30e
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · cfd4951d
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
      
      
      cfd4951d
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 3c1b039d
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
      
      
      configure.in:
        null merge
      3c1b039d
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 6a1046f6
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
      
      
      6a1046f6